From: H. Peter Anvin <hpa@zytor.com>
Date: Wed, 12 Nov 2008 18:27:35 +0000 (-0800)
Subject: x86: fix up the new IRQ code for older versions of gas
X-Git-Tag: v2.6.29-rc1~587^2~1^2~26
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8665596ec05498525014436520b316ba174a068a;p=linux-2.6-block.git

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>
---

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
 	.balign 32
   .rept	7
     .if vector < NR_VECTORS
-      .if vector != FIRST_EXTERNAL_VECTOR
+      .if vector <> FIRST_EXTERNAL_VECTOR
 	CFI_ADJUST_CFA_OFFSET -4
       .endif
 1:	pushl $(~vector+0x80)	/* Note: always in signed byte range */
 	CFI_ADJUST_CFA_OFFSET 4
-      .if ((vector-FIRST_EXTERNAL_VECTOR)%7) != 6
+      .if ((vector-FIRST_EXTERNAL_VECTOR)%7) <> 6
 	jmp 2f
       .endif
       .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
 	.balign 32
   .rept	7
     .if vector < NR_VECTORS
-      .if vector != FIRST_EXTERNAL_VECTOR
+      .if vector <> FIRST_EXTERNAL_VECTOR
 	CFI_ADJUST_CFA_OFFSET -8
       .endif
 1:	pushq $(~vector+0x80)	/* Note: always in signed byte range */
 	CFI_ADJUST_CFA_OFFSET 8
-      .if ((vector-FIRST_EXTERNAL_VECTOR)%7) != 6
+      .if ((vector-FIRST_EXTERNAL_VECTOR)%7) <> 6
 	jmp 2f
       .endif
       .previous