remove STR() macros
PATCH 1/1 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()
Signed-off-by Glauber de Oliveira Costa <[email protected]>
--- arch/x86_64/ia32/ia32_binfmt.c | 5 +---- include/asm-x86_64/hw_irq.h | 3 --- include/asm-x86_64/system.h | 3 --- 3 files changed, 1 insertions(+), 10 deletions(-)
arch/x86_64/ia32/ia32_binfmt.c +1 -4
@@ -112,11 +112,8 @@ struct elf_prpsinfochar 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) \
include/asm-x86_64/hw_irq.h +0 -3
@@ -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)
include/asm-x86_64/system.h +0 -3
@@ -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"
Signature · 1 line
1.4.4.2