Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Remove lapic_tpr on amd64 and i386, unused. Now, we...



details:   https://anonhg.NetBSD.org/src/rev/5a2ff255806e
branches:  trunk
changeset: 818518:5a2ff255806e
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Oct 16 10:51:31 2016 +0000

description:
Remove lapic_tpr on amd64 and i386, unused. Now, we have only one pointer
to the LAPIC page, and each register access is done with relative offsets.

diffstat:

 sys/arch/amd64/amd64/locore.S    |  11 +++--------
 sys/arch/i386/i386/locore.S      |  17 +++--------------
 sys/arch/x86/include/i82489var.h |   3 +--
 3 files changed, 7 insertions(+), 24 deletions(-)

diffs (91 lines):

diff -r f81e38c45efc -r 5a2ff255806e sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Sun Oct 16 10:38:49 2016 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Sun Oct 16 10:51:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.109 2016/08/21 09:53:25 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.110 2016/10/16 10:51:31 maxv Exp $        */
 
 /*
  * Copyright-o-rama!
@@ -316,17 +316,12 @@
 #if NLAPIC > 0
        .align  PAGE_SIZE
        .globl  _C_LABEL(local_apic)
-       .globl  _C_LABEL(lapic_tpr)
 
        .type   _C_LABEL(local_apic), @object
 LABEL(local_apic)
-       .space  LAPIC_TPRI
+       .space  PAGE_SIZE
 END(local_apic)
-       .type   _C_LABEL(lapic_tpr), @object
-LABEL(lapic_tpr)
-       .space  PAGE_SIZE-LAPIC_TPRI
-END(lapic_tpr)
-#endif /* NLAPIC > 0 */
+#endif
 
        .globl  _C_LABEL(tablesize)
        .globl  _C_LABEL(nox_flag)
diff -r f81e38c45efc -r 5a2ff255806e sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Sun Oct 16 10:38:49 2016 +0000
+++ b/sys/arch/i386/i386/locore.S       Sun Oct 16 10:51:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.137 2016/07/25 16:03:38 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.138 2016/10/16 10:51:31 maxv Exp $        */
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.137 2016/07/25 16:03:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.138 2016/10/16 10:51:31 maxv Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_copy_symtab.h"
@@ -270,25 +270,14 @@
  */
        .data
 
-       .globl  _C_LABEL(lapic_tpr)
-
 #if NLAPIC > 0
        .align  PAGE_SIZE
        .globl  _C_LABEL(local_apic)
 
        .type   _C_LABEL(local_apic), @object
 LABEL(local_apic)
-       .space  LAPIC_TPRI
+       .space  PAGE_SIZE
 END(local_apic)
-       .type   _C_LABEL(lapic_tpr), @object
-LABEL(lapic_tpr)
-       .space  PAGE_SIZE-LAPIC_TPRI
-END(lapic_tpr)
-#else
-       .type   _C_LABEL(lapic_tpr), @object
-LABEL(lapic_tpr)
-       .long 0
-END(lapic_tpr)
 #endif
 
        .globl  _C_LABEL(tablesize)
diff -r f81e38c45efc -r 5a2ff255806e sys/arch/x86/include/i82489var.h
--- a/sys/arch/x86/include/i82489var.h  Sun Oct 16 10:38:49 2016 +0000
+++ b/sys/arch/x86/include/i82489var.h  Sun Oct 16 10:51:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82489var.h,v 1.14 2011/06/12 03:35:50 rmind Exp $     */
+/*     $NetBSD: i82489var.h,v 1.15 2016/10/16 10:51:31 maxv Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,6 @@
 
 #ifdef _KERNEL
 extern volatile uint32_t local_apic[];
-extern volatile uint32_t lapic_tpr;
 #endif
 
 static __inline uint32_t



Home | Main Index | Thread Index | Old Index