diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2007-10-17 18:04:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:16:25 +0200 |
| commit | 92b2dc79c3bb3f08afae6c0feaeea593b9c83a76 (patch) | |
| tree | a4d38dc90e0abf5f0ea7d64afedc9d96ad5e4fd4 | |
| parent | 9efa98159c8b4fd7373d03af9fc06d43f47de0f5 (diff) | |
| download | op-kernel-dev-92b2dc79c3bb3f08afae6c0feaeea593b9c83a76.zip op-kernel-dev-92b2dc79c3bb3f08afae6c0feaeea593b9c83a76.tar.gz | |
x86: remove STR() macros
This patch removes the __STR() and STR() macros from x86_64 header files.
They seem to be legacy, and has no more users. Even if there were users,
they should use __stringify() instead.
In fact, there were one third place in which this macro was defined
(ia32_binfmt.c), and used just below. In this file, usage was properly
converted to __stringify()
[ tglx: arch/x86 adaptation ]
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/ia32/ia32_binfmt.c | 5 | ||||
| -rw-r--r-- | include/asm-x86/hw_irq_64.h | 3 | ||||
| -rw-r--r-- | include/asm-x86/system_64.h | 3 |
3 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c index d3c53e8..118b9f9 100644 --- a/arch/x86/ia32/ia32_binfmt.c +++ b/arch/x86/ia32/ia32_binfmt.c @@ -112,11 +112,8 @@ struct elf_prpsinfo char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */ }; -#define __STR(x) #x -#define STR(x) __STR(x) - #define _GET_SEG(x) \ - ({ __u32 seg; asm("movl %%" STR(x) ",%0" : "=r"(seg)); seg; }) + ({ __u32 seg; asm("movl %%" __stringify(x) ",%0" : "=r"(seg)); seg; }) /* Assumes current==process to be dumped */ #define ELF_CORE_COPY_REGS(pr_reg, regs) \ diff --git a/include/asm-x86/hw_irq_64.h b/include/asm-x86/hw_irq_64.h index 09dfc18..dc0a953d 100644 --- a/include/asm-x86/hw_irq_64.h +++ b/include/asm-x86/hw_irq_64.h @@ -148,9 +148,6 @@ extern atomic_t irq_mis_count; #define IO_APIC_IRQ(x) (((x) >= 16) || ((1<<(x)) & io_apic_irqs)) -#define __STR(x) #x -#define STR(x) __STR(x) - #include <asm/ptrace.h> #define IRQ_NAME2(nr) nr##_interrupt(void) diff --git a/include/asm-x86/system_64.h b/include/asm-x86/system_64.h index ec4c29b..4cb2384 100644 --- a/include/asm-x86/system_64.h +++ b/include/asm-x86/system_64.h @@ -7,9 +7,6 @@ #ifdef __KERNEL__ -#define __STR(x) #x -#define STR(x) __STR(x) - #define __SAVE(reg,offset) "movq %%" #reg ",(14-" #offset ")*8(%%rsp)\n\t" #define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t" |
