kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: trivial header merges

Browse source 
Merge 32/64-bit headers that simply redirect to asm-generic

[tglx: fixup Kbuild as well]

Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Brian Gerst 2007-10-15 13:57:46 +02:00 committed by Thomas Gleixner
parent c65916fe35
commit 020bd9f1c7
16 changed files with 5 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/asm-x86/Kbuild
View file

@ -22,8 +22,6 @@ unifdef-y += byteorder_32.h
unifdef-y += byteorder_64.h
unifdef-y += elf_32.h
unifdef-y += elf_64.h
unifdef-y += errno_32.h
unifdef-y += errno_64.h
unifdef-y += ioctls_32.h
unifdef-y += ioctls_64.h
unifdef-y += ipcbuf_32.h
@ -47,8 +45,6 @@ unifdef-y += posix_types_32.h
unifdef-y += posix_types_64.h
unifdef-y += ptrace_32.h
unifdef-y += ptrace_64.h
unifdef-y += resource_32.h
unifdef-y += resource_64.h
unifdef-y += sembuf_32.h
unifdef-y += sembuf_64.h
unifdef-y += setup_32.h

6
include/asm-x86/cputime.h
View file

@ -1,5 +1 @@
#ifdef CONFIG_X86_32
# include "cputime_32.h"
#else
# include "cputime_64.h"
#endif
#include <asm-generic/cputime.h>

6
include/asm-x86/cputime_32.h
View file

@ -1,6 +0,0 @@
#ifndef __I386_CPUTIME_H
#define __I386_CPUTIME_H
#include <asm-generic/cputime.h>
#endif /* __I386_CPUTIME_H */

6
include/asm-x86/cputime_64.h
View file

@ -1,6 +0,0 @@
#ifndef __X86_64_CPUTIME_H
#define __X86_64_CPUTIME_H
#include <asm-generic/cputime.h>
#endif /* __X86_64_CPUTIME_H */

14
include/asm-x86/errno.h
View file

@ -1,13 +1 @@
#ifdef __KERNEL__
# ifdef CONFIG_X86_32
# include "errno_32.h"
# else
# include "errno_64.h"
# endif
#else
# ifdef __i386__
# include "errno_32.h"
# else
# include "errno_64.h"
# endif
#endif
#include <asm-generic/errno.h>

6
include/asm-x86/errno_32.h
View file

@ -1,6 +0,0 @@
#ifndef _I386_ERRNO_H
#define _I386_ERRNO_H
#include <asm-generic/errno.h>
#endif

6
include/asm-x86/errno_64.h
View file

@ -1,6 +0,0 @@
#ifndef _X8664_ERRNO_H
#define _X8664_ERRNO_H
#include <asm-generic/errno.h>
#endif

14
include/asm-x86/resource.h
View file

@ -1,13 +1 @@
#ifdef __KERNEL__
# ifdef CONFIG_X86_32
# include "resource_32.h"
# else
# include "resource_64.h"
# endif
#else
# ifdef __i386__
# include "resource_32.h"
# else
# include "resource_64.h"
# endif
#endif
#include <asm-generic/resource.h>

6
include/asm-x86/resource_32.h
View file

@ -1,6 +0,0 @@
#ifndef _I386_RESOURCE_H
#define _I386_RESOURCE_H
#include <asm-generic/resource.h>
#endif

6
include/asm-x86/resource_64.h
View file

@ -1,6 +0,0 @@
#ifndef _X8664_RESOURCE_H
#define _X8664_RESOURCE_H
#include <asm-generic/resource.h>
#endif

6
include/asm-x86/rtc.h
View file

@ -1,5 +1 @@
#ifdef CONFIG_X86_32
# include "rtc_32.h"
#else
# include "rtc_64.h"
#endif
#include <asm-generic/rtc.h>

10
include/asm-x86/rtc_32.h
View file

@ -1,10 +0,0 @@
#ifndef _I386_RTC_H
#define _I386_RTC_H
/*
* x86 uses the default access methods for the RTC.
*/
#include <asm-generic/rtc.h>
#endif

10
include/asm-x86/rtc_64.h
View file

@ -1,10 +0,0 @@
#ifndef _X86_64_RTC_H
#define _X86_64_RTC_H
/*
* x86 uses the default access methods for the RTC.
*/
#include <asm-generic/rtc.h>
#endif

6
include/asm-x86/sections.h
View file

@ -1,5 +1 @@
#ifdef CONFIG_X86_32
# include "sections_32.h"
#else
# include "sections_64.h"
#endif
#include <asm-generic/sections.h>

7
include/asm-x86/sections_32.h
View file

@ -1,7 +0,0 @@
#ifndef _I386_SECTIONS_H
#define _I386_SECTIONS_H
/* nothing to see, move along */
#include <asm-generic/sections.h>
#endif

7
include/asm-x86/sections_64.h
View file

@ -1,7 +0,0 @@
#ifndef _X8664_SECTIONS_H
#define _X8664_SECTIONS_H
/* nothing to see, move along */
#include <asm-generic/sections.h>
#endif