diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2007-05-02 13:27:05 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 13:27:05 -0400 |
commit | f76c392380a40008ee6ecaea4e5a51a3a10282c4 (patch) | |
tree | b998e776953aa8ede63d209a38c3fd9ec07a46b9 | |
parent | 9964cf7d776600724ef5f1b33303ceadc588b8ba (diff) |
[PATCH] i386: No need to use -traditional for processing asm in i386/kernel/
No need to use -traditional for processing asm in i386/kernel/
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/i386/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/i386/kernel/entry.S | 2 | ||||
-rw-r--r-- | include/asm-i386/percpu.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 4ae3dcf1d2f0..bd7753cb9e69 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
@@ -43,8 +43,6 @@ obj-$(CONFIG_VMI) += vmi.o vmitime.o | |||
43 | obj-$(CONFIG_PARAVIRT) += paravirt.o | 43 | obj-$(CONFIG_PARAVIRT) += paravirt.o |
44 | obj-y += pcspeaker.o | 44 | obj-y += pcspeaker.o |
45 | 45 | ||
46 | EXTRA_AFLAGS := -traditional | ||
47 | |||
48 | obj-$(CONFIG_SCx200) += scx200.o | 46 | obj-$(CONFIG_SCx200) += scx200.o |
49 | 47 | ||
50 | # vsyscall.o contains the vsyscall DSO images as __initdata. | 48 | # vsyscall.o contains the vsyscall DSO images as __initdata. |
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index 18bddcb8e9e8..922cc38dc405 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S | |||
@@ -635,7 +635,7 @@ ENTRY(name) \ | |||
635 | SAVE_ALL; \ | 635 | SAVE_ALL; \ |
636 | TRACE_IRQS_OFF \ | 636 | TRACE_IRQS_OFF \ |
637 | movl %esp,%eax; \ | 637 | movl %esp,%eax; \ |
638 | call smp_/**/name; \ | 638 | call smp_##name; \ |
639 | jmp ret_from_intr; \ | 639 | jmp ret_from_intr; \ |
640 | CFI_ENDPROC; \ | 640 | CFI_ENDPROC; \ |
641 | ENDPROC(name) | 641 | ENDPROC(name) |
diff --git a/include/asm-i386/percpu.h b/include/asm-i386/percpu.h index 510ae1d3486c..a10e7c68ae9d 100644 --- a/include/asm-i386/percpu.h +++ b/include/asm-i386/percpu.h | |||
@@ -20,10 +20,10 @@ | |||
20 | #ifdef CONFIG_SMP | 20 | #ifdef CONFIG_SMP |
21 | #define PER_CPU(var, cpu) \ | 21 | #define PER_CPU(var, cpu) \ |
22 | movl __per_cpu_offset(,cpu,4), cpu; \ | 22 | movl __per_cpu_offset(,cpu,4), cpu; \ |
23 | addl $per_cpu__/**/var, cpu; | 23 | addl $per_cpu__##var, cpu; |
24 | #else /* ! SMP */ | 24 | #else /* ! SMP */ |
25 | #define PER_CPU(var, cpu) \ | 25 | #define PER_CPU(var, cpu) \ |
26 | movl $per_cpu__/**/var, cpu; | 26 | movl $per_cpu__##var, cpu; |
27 | #endif /* SMP */ | 27 | #endif /* SMP */ |
28 | 28 | ||
29 | #endif /* !__ASSEMBLY__ */ | 29 | #endif /* !__ASSEMBLY__ */ |