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

Commit b8cd9d05 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1 



Conflicts:
	include/asm-x86/dma-mapping.h
	include/asm-x86/gpio.h
	include/asm-x86/idle.h
	include/asm-x86/kvm_host.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents fec6ed1d 1503af66

arch/x86/boot/compressed/misc.c

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

#undef CONFIG_PARAVIRT

#ifdef CONFIG_X86_32

#define _ASM_DESC_H_ 1

#define ASM_X86__DESC_H 1

#endif



#ifdef CONFIG_X86_64

arch/x86/kernel/asm-offsets_64.c

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


#define __NO_STUBS 1

#undef __SYSCALL

#undef _ASM_X86_64_UNISTD_H_

#undef ASM_X86__UNISTD_64_H

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

static char syscalls[] = {

#include <asm/unistd.h>

arch/x86/kernel/syscall_64.c

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



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



#undef __SYSCALL

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

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

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

 */



#ifndef _ASM_A_OUT_CORE_H

#define _ASM_A_OUT_CORE_H

#ifndef ASM_X86__A_OUT_CORE_H

#define ASM_X86__A_OUT_CORE_H



#ifdef __KERNEL__

#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 /* __KERNEL__ */

#endif /* _ASM_A_OUT_CORE_H */
 
#endif /* ASM_X86__A_OUT_CORE_H */

include/asm-x86/a.out.h

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

#define _ASM_X86_A_OUT_H

#ifndef ASM_X86__A_OUT_H

#define ASM_X86__A_OUT_H



struct exec

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

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



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