Commit 003a46cf authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify some more trivial include/asm-x86/ 32/64 variants 



Scripted unification.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 217d115c

include/asm-x86/Kbuild

+0 −14
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ header-y += msr-index.h 
header-y += prctl.h

header-y += ptrace-abi.h

header-y += sigcontext32.h

header-y += ucontext_32.h

header-y += ucontext_64.h

header-y += ucontext.h

header-y += vsyscall32.h
@@ -24,8 +22,6 @@ unifdef-y += elf_32.h 
unifdef-y += elf_64.h

unifdef-y += ioctls_32.h

unifdef-y += ioctls_64.h

unifdef-y += ipcbuf_32.h

unifdef-y += ipcbuf_64.h

unifdef-y += mce.h

unifdef-y += mman_32.h

unifdef-y += mman_64.h
@@ -39,20 +35,14 @@ unifdef-y += mtrr_64.h 
unifdef-y += mtrr.h

unifdef-y += page_32.h

unifdef-y += page_64.h

unifdef-y += param_32.h

unifdef-y += param_64.h

unifdef-y += posix_types_32.h

unifdef-y += posix_types_64.h

unifdef-y += ptrace_32.h

unifdef-y += ptrace_64.h

unifdef-y += sembuf_32.h

unifdef-y += sembuf_64.h

unifdef-y += setup_32.h

unifdef-y += setup_64.h

unifdef-y += shmbuf_32.h

unifdef-y += shmbuf_64.h

unifdef-y += shmparam_32.h

unifdef-y += shmparam_64.h

unifdef-y += sigcontext_32.h

unifdef-y += sigcontext_64.h

unifdef-y += siginfo_32.h
@@ -63,10 +53,6 @@ unifdef-y += stat_32.h 
unifdef-y += stat_64.h

unifdef-y += statfs_32.h

unifdef-y += statfs_64.h

unifdef-y += termbits_32.h

unifdef-y += termbits_64.h

unifdef-y += termios_32.h

unifdef-y += termios_64.h

unifdef-y += types_32.h

unifdef-y += types_64.h

unifdef-y += unistd_32.h

include/asm-x86/bugs.h

+6 −5
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "bugs_32.h"

#else

# include "bugs_64.h"

#endif
 
#ifndef _ASM_X86_BUGS_H

#define _ASM_X86_BUGS_H



void check_bugs(void);



#endif /* _ASM_X86_BUGS_H */

include/asm-x86/bugs_32.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/*

 * This is included by init/main.c to check for architecture-dependent bugs.

 *

 * Needs:

 *	void check_bugs(void);

 */

#ifndef _ASM_I386_BUG_H

#define _ASM_I386_BUG_H



void check_bugs(void);



#endif	/* _ASM_I386_BUG_H */

include/asm-x86/bugs_64.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _ASM_X86_64_BUGS_H

#define _ASM_X86_64_BUGS_H



void check_bugs(void);



#endif	/* _ASM_X86_64_BUGS_H */

include/asm-x86/device.h

+9 −4
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "device_32.h"

#else

# include "device_64.h"

#ifndef _ASM_X86_DEVICE_H

#define _ASM_X86_DEVICE_H



struct dev_archdata {

#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

};



#endif /* _ASM_X86_DEVICE_H */