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

Commit a3186316 authored Jul 22, 2008 by Vegard Nossum

x86: consolidate header guards



This patch consolidates the header guard names which are also used
externally, i.e. in .c files.

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

parent 77ef50a5

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_DESC_H_ 1		#define ASM_X86__DESC_H 1
	#endif		#endif

	#ifdef CONFIG_X86_64		#ifdef CONFIG_X86_64

arch/x86/kernel/asm-offsets_64.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@

	#define __NO_STUBS 1		#define __NO_STUBS 1
	#undef __SYSCALL		#undef __SYSCALL
	#undef _ASM_X86_64_UNISTD_H_		#undef ASM_X86__UNISTD_64_H
	#define __SYSCALL(nr, sym) [nr] = 1,		#define __SYSCALL(nr, sym) [nr] = 1,
	static char syscalls[] = {		static char syscalls[] = {
	#include <asm/unistd.h>		#include <asm/unistd.h>

arch/x86/kernel/syscall_64.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,12 +8,12 @@
	#define __NO_STUBS		#define __NO_STUBS

	#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;		#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
	#undef _ASM_X86_64_UNISTD_H_		#undef ASM_X86__UNISTD_64_H
	#include <asm/unistd_64.h>		#include <asm/unistd_64.h>

	#undef __SYSCALL		#undef __SYSCALL
	#define __SYSCALL(nr, sym) [nr] = sym,		#define __SYSCALL(nr, sym) [nr] = sym,
	#undef _ASM_X86_64_UNISTD_H_		#undef ASM_X86__UNISTD_64_H

	typedef void (*sys_call_ptr_t)(void);		typedef void (*sys_call_ptr_t)(void);

include/asm-x86/desc.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_DESC_H_		#ifndef ASM_X86__DESC_H
	#define _ASM_DESC_H_		#define ASM_X86__DESC_H

	#ifndef __ASSEMBLY__		#ifndef __ASSEMBLY__
	#include <asm/desc_defs.h>		#include <asm/desc_defs.h>
	@@ -397,4 +397,4 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)

	#endif /* __ASSEMBLY__ */		#endif /* __ASSEMBLY__ */

	#endif		#endif /* ASM_X86__DESC_H */

include/asm-x86/unistd_64.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_64_UNISTD_H_		#ifndef ASM_X86__UNISTD_64_H
	#define _ASM_X86_64_UNISTD_H_		#define ASM_X86__UNISTD_64_H

	#ifndef __SYSCALL		#ifndef __SYSCALL
	#define __SYSCALL(a, b)		#define __SYSCALL(a, b)
	@@ -676,4 +676,4 @@ __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)
	#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")		#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
	#endif /* __KERNEL__ */		#endif /* __KERNEL__ */

	#endif /* _ASM_X86_64_UNISTD_H_ */		#endif /* ASM_X86__UNISTD_64_H */