[src/trunk]: src/sys/arch/i386/i386 This needs to be page-aligned anyway.

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

details:   https://anonhg.NetBSD.org/src/rev/6d317e32c6f7
branches:  trunk
changeset: 816791:6d317e32c6f7
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Jul 25 15:18:41 2016 +0000

description:
This needs to be page-aligned anyway.

diffstat:

 sys/arch/i386/i386/locore.S |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r 90b9715e93e5 -r 6d317e32c6f7 sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Mon Jul 25 12:45:13 2016 +0000
+++ b/sys/arch/i386/i386/locore.S       Mon Jul 25 15:18:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.135 2016/07/09 06:58:06 maxv Exp $        */
+/*     $NetBSD: locore.S,v 1.136 2016/07/25 15:18:41 maxv Exp $        */
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.135 2016/07/09 06:58:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.136 2016/07/25 15:18:41 maxv Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_copy_symtab.h"
@@ -273,11 +273,7 @@
        .globl  _C_LABEL(lapic_tpr)
 
 #if NLAPIC > 0
-#ifdef __ELF__
        .align  PAGE_SIZE
-#else
-       .align  12
-#endif
        .globl  _C_LABEL(local_apic)
        .globl  _C_LABEL(lapic_id)