Module Name: src
Committed By: maxv
Date: Mon Jul 25 16:03:38 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
Log Message:
Remove lapic_id, lapic_ppr and lapic_isr. We need to be careful though: the
offset of lapic_tpr must not change, and the whole area must be exactly one
page.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/i386/i386/locore.S
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.107 src/sys/arch/amd64/amd64/locore.S:1.108
--- src/sys/arch/amd64/amd64/locore.S:1.107 Mon Jul 11 14:52:54 2016
+++ src/sys/arch/amd64/amd64/locore.S Mon Jul 25 16:03:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.107 2016/07/11 14:52:54 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.108 2016/07/25 16:03:38 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -316,30 +316,16 @@
#if NLAPIC > 0
.align PAGE_SIZE
.globl _C_LABEL(local_apic)
- .globl _C_LABEL(lapic_id)
.globl _C_LABEL(lapic_tpr)
.type _C_LABEL(local_apic), @object
LABEL(local_apic)
- .space LAPIC_ID
+ .space LAPIC_TPRI
END(local_apic)
- .type _C_LABEL(lapic_id), @object
-LABEL(lapic_id)
- .long 0x00000000
- .space LAPIC_TPRI-(LAPIC_ID+4)
-END(lapic_id)
.type _C_LABEL(lapic_tpr), @object
LABEL(lapic_tpr)
- .space LAPIC_PPRI-LAPIC_TPRI
+ .space PAGE_SIZE-LAPIC_TPRI
END(lapic_tpr)
- .type _C_LABEL(lapic_ppr), @object
-_C_LABEL(lapic_ppr):
- .space LAPIC_ISR-LAPIC_PPRI
-END(lapic_ppr)
- .type _C_LABEL(lapic_isr), @object
-_C_LABEL(lapic_isr):
- .space PAGE_SIZE-LAPIC_ISR
-END(lapic_isr)
#endif /* NLAPIC > 0 */
.globl _C_LABEL(tablesize)
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.136 src/sys/arch/i386/i386/locore.S:1.137
--- src/sys/arch/i386/i386/locore.S:1.136 Mon Jul 25 15:18:41 2016
+++ src/sys/arch/i386/i386/locore.S Mon Jul 25 16:03:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.136 2016/07/25 15:18:41 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.137 2016/07/25 16:03:38 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.136 2016/07/25 15:18:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.137 2016/07/25 16:03:38 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
@@ -275,29 +275,15 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1
#if NLAPIC > 0
.align PAGE_SIZE
.globl _C_LABEL(local_apic)
- .globl _C_LABEL(lapic_id)
.type _C_LABEL(local_apic), @object
LABEL(local_apic)
- .space LAPIC_ID
+ .space LAPIC_TPRI
END(local_apic)
- .type _C_LABEL(lapic_id), @object
-LABEL(lapic_id)
- .long 0x00000000
- .space LAPIC_TPRI-(LAPIC_ID+4)
-END(lapic_id)
.type _C_LABEL(lapic_tpr), @object
LABEL(lapic_tpr)
- .space LAPIC_PPRI-LAPIC_TPRI
+ .space PAGE_SIZE-LAPIC_TPRI
END(lapic_tpr)
- .type _C_LABEL(lapic_ppr), @object
-_C_LABEL(lapic_ppr):
- .space LAPIC_ISR-LAPIC_PPRI
-END(lapic_ppr)
- .type _C_LABEL(lapic_isr), @object
-_C_LABEL(lapic_isr):
- .space PAGE_SIZE-LAPIC_ISR
-END(lapic_isr)
#else
.type _C_LABEL(lapic_tpr), @object
LABEL(lapic_tpr)
