[src/trunk]: src/sys/arch Remove lapic_id, lapic_ppr and lapic_isr. We need t...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/938cce6340de
branches:  trunk
changeset: 346651:938cce6340de
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Jul 25 16:03:38 2016 +0000

description:
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.

diffstat:

 sys/arch/amd64/amd64/locore.S |  20 +++-----------------
 sys/arch/i386/i386/locore.S   |  22 ++++------------------
 2 files changed, 7 insertions(+), 35 deletions(-)

diffs (92 lines):

diff -r 4ec33bc60f9d -r 938cce6340de sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Mon Jul 25 15:29:06 2016 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Mon Jul 25 16:03:38 2016 +0000
@@ -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)
diff -r 4ec33bc60f9d -r 938cce6340de sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Mon Jul 25 15:29:06 2016 +0000
+++ b/sys/arch/i386/i386/locore.S       Mon Jul 25 16:03:38 2016 +0000
@@ -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 @@
 #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)