Module Name:    src
Committed By:   maxv
Date:           Sun Oct 16 10:51:31 UTC 2016

Modified Files:
        src/sys/arch/amd64/amd64: locore.S
        src/sys/arch/i386/i386: locore.S
        src/sys/arch/x86/include: i82489var.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/include/i82489var.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.109 src/sys/arch/amd64/amd64/locore.S:1.110
--- src/sys/arch/amd64/amd64/locore.S:1.109	Sun Aug 21 09:53:25 2016
+++ src/sys/arch/amd64/amd64/locore.S	Sun Oct 16 10:51:31 2016
@@ -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)

Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.137 src/sys/arch/i386/i386/locore.S:1.138
--- src/sys/arch/i386/i386/locore.S:1.137	Mon Jul 25 16:03:38 2016
+++ src/sys/arch/i386/i386/locore.S	Sun Oct 16 10:51:31 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1
  */
 	.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)

Index: src/sys/arch/x86/include/i82489var.h
diff -u src/sys/arch/x86/include/i82489var.h:1.14 src/sys/arch/x86/include/i82489var.h:1.15
--- src/sys/arch/x86/include/i82489var.h:1.14	Sun Jun 12 03:35:50 2011
+++ src/sys/arch/x86/include/i82489var.h	Sun Oct 16 10:51:31 2016
@@ -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 @@ static __inline void i82489_writereg(int
 
 #ifdef _KERNEL
 extern volatile uint32_t local_apic[];
-extern volatile uint32_t lapic_tpr;
 #endif
 
 static __inline uint32_t

Reply via email to