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

Commit 1965aae3 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: Fix ASM_X86__ header guards 



Change header guards named "ASM_X86__*" to "_ASM_X86_*" since:

a. the double underscore is ugly and pointless.
b. no leading underscore violates namespace constraints.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 87e299e5

arch/um/sys-x86_64/syscall_table.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -41,12 +41,12 @@ 
#define stub_rt_sigreturn sys_rt_sigreturn

#define stub_rt_sigreturn sys_rt_sigreturn





#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;

#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;

#undef ASM_X86__UNISTD_64_H

#undef _ASM_X86_UNISTD_64_H

#include "../../x86/include/asm/unistd_64.h"

#include "../../x86/include/asm/unistd_64.h"





#undef __SYSCALL

#undef __SYSCALL

#define __SYSCALL(nr, sym) [ nr ] = sym,

#define __SYSCALL(nr, sym) [ nr ] = sym,

#undef ASM_X86__UNISTD_64_H

#undef _ASM_X86_UNISTD_64_H





typedef void (*sys_call_ptr_t)(void);

typedef void (*sys_call_ptr_t)(void);

arch/x86/boot/compressed/misc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
 */

 */

#undef CONFIG_PARAVIRT

#undef CONFIG_PARAVIRT

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

#define ASM_X86__DESC_H 1

#define _ASM_X86_DESC_H 1

#endif

#endif





#ifdef CONFIG_X86_64

#ifdef CONFIG_X86_64

arch/x86/include/asm/a.out-core.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -9,8 +9,8 @@ 
 * 2 of the Licence, or (at your option) any later version.

 * 2 of the Licence, or (at your option) any later version.

 */

 */





#ifndef ASM_X86__A_OUT_CORE_H

#ifndef _ASM_X86_A_OUT_CORE_H

#define ASM_X86__A_OUT_CORE_H

#define _ASM_X86_A_OUT_CORE_H





#ifdef __KERNEL__

#ifdef __KERNEL__

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32
@@ -70,4 +70,4 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) 




#endif /* CONFIG_X86_32 */

#endif /* CONFIG_X86_32 */

#endif /* __KERNEL__ */

#endif /* __KERNEL__ */

#endif /* ASM_X86__A_OUT_CORE_H */
 
#endif /* _ASM_X86_A_OUT_CORE_H */

arch/x86/include/asm/a.out.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef ASM_X86__A_OUT_H

#ifndef _ASM_X86_A_OUT_H

#define ASM_X86__A_OUT_H

#define _ASM_X86_A_OUT_H





struct exec

struct exec

{

{
@@ -17,4 +17,4 @@ struct exec 
#define N_DRSIZE(a)	((a).a_drsize)

#define N_DRSIZE(a)	((a).a_drsize)

#define N_SYMSIZE(a)	((a).a_syms)

#define N_SYMSIZE(a)	((a).a_syms)





#endif /* ASM_X86__A_OUT_H */
 
#endif /* _ASM_X86_A_OUT_H */

arch/x86/include/asm/acpi.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef ASM_X86__ACPI_H

#ifndef _ASM_X86_ACPI_H

#define ASM_X86__ACPI_H

#define _ASM_X86_ACPI_H





/*

/*

 *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -175,4 +175,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes, 




#define acpi_unlazy_tlb(x)	leave_mm(x)

#define acpi_unlazy_tlb(x)	leave_mm(x)





#endif /* ASM_X86__ACPI_H */
 
#endif /* _ASM_X86_ACPI_H */