Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92b2dc79 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Thomas Gleixner
Browse files

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: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9efa9815

arch/x86/ia32/ia32_binfmt.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -112,11 +112,8 @@ struct elf_prpsinfo 
	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */

	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */

};

};





#define __STR(x) #x

#define STR(x) __STR(x)



#define _GET_SEG(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 */

/* Assumes current==process to be dumped */

#define ELF_CORE_COPY_REGS(pr_reg, regs)       		\

#define ELF_CORE_COPY_REGS(pr_reg, regs)       		\

include/asm-x86/hw_irq_64.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -148,9 +148,6 @@ extern atomic_t irq_mis_count; 




#define IO_APIC_IRQ(x) (((x) >= 16) || ((1<<(x)) & io_apic_irqs))

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

#include <asm/ptrace.h>





#define IRQ_NAME2(nr) nr##_interrupt(void)

#define IRQ_NAME2(nr) nr##_interrupt(void)

include/asm-x86/system_64.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -7,9 +7,6 @@ 




#ifdef __KERNEL__

#ifdef __KERNEL__





#define __STR(x) #x

#define STR(x) __STR(x)



#define __SAVE(reg,offset) "movq %%" #reg ",(14-" #offset ")*8(%%rsp)\n\t"

#define __SAVE(reg,offset) "movq %%" #reg ",(14-" #offset ")*8(%%rsp)\n\t"

#define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t"

#define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t"