aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-11-12 13:27:35 -0500
committerH. Peter Anvin <hpa@zytor.com>2008-11-12 13:27:35 -0500
commit8665596ec05498525014436520b316ba174a068a (patch)
tree84b60a30d94e91f5a0f30160bdea6b68dcb86492
parent939b787130bf22887a09d8fd2641a094dcef8c22 (diff)
x86: fix up the new IRQ code for older versions of gas
Older versions of gas don't implement the C-style != operator, they instead want the Pascal-style <> operator. Change != to <> so we don't break compilation with those old versions of gas. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/kernel/entry_32.S4
-rw-r--r--arch/x86/kernel/entry_64.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index dae81b9fd451..bd02ec77edc4 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -635,12 +635,12 @@ vector=FIRST_EXTERNAL_VECTOR
635 .balign 32 635 .balign 32
636 .rept 7 636 .rept 7
637 .if vector < NR_VECTORS 637 .if vector < NR_VECTORS
638 .if vector != FIRST_EXTERNAL_VECTOR 638 .if vector <> FIRST_EXTERNAL_VECTOR
639 CFI_ADJUST_CFA_OFFSET -4 639 CFI_ADJUST_CFA_OFFSET -4
640 .endif 640 .endif
6411: pushl $(~vector+0x80) /* Note: always in signed byte range */ 6411: pushl $(~vector+0x80) /* Note: always in signed byte range */
642 CFI_ADJUST_CFA_OFFSET 4 642 CFI_ADJUST_CFA_OFFSET 4
643 .if ((vector-FIRST_EXTERNAL_VECTOR)%7) != 6 643 .if ((vector-FIRST_EXTERNAL_VECTOR)%7) <> 6
644 jmp 2f 644 jmp 2f
645 .endif 645 .endif
646 .previous 646 .previous
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 9b2aeaac9a6b..2b42362a85b2 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -644,12 +644,12 @@ vector=FIRST_EXTERNAL_VECTOR
644 .balign 32 644 .balign 32
645 .rept 7 645 .rept 7
646 .if vector < NR_VECTORS 646 .if vector < NR_VECTORS
647 .if vector != FIRST_EXTERNAL_VECTOR 647 .if vector <> FIRST_EXTERNAL_VECTOR
648 CFI_ADJUST_CFA_OFFSET -8 648 CFI_ADJUST_CFA_OFFSET -8
649 .endif 649 .endif
6501: pushq $(~vector+0x80) /* Note: always in signed byte range */ 6501: pushq $(~vector+0x80) /* Note: always in signed byte range */
651 CFI_ADJUST_CFA_OFFSET 8 651 CFI_ADJUST_CFA_OFFSET 8
652 .if ((vector-FIRST_EXTERNAL_VECTOR)%7) != 6 652 .if ((vector-FIRST_EXTERNAL_VECTOR)%7) <> 6
653 jmp 2f 653 jmp 2f
654 .endif 654 .endif
655 .previous 655 .previous