diff options
author | Brian Gerst <bgerst@didntduck.org> | 2007-10-15 07:57:46 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:08 -0400 |
commit | 020bd9f1c766ca743556461a70a5b5d559b7e60c (patch) | |
tree | 73833b4a886620c0ccfd79ffb3a98a04206eaeb3 /include | |
parent | c65916fe3586521932fbd1b734f39744657f2f0d (diff) |
x86: trivial header merges
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/Kbuild | 4 | ||||
-rw-r--r-- | include/asm-x86/cputime.h | 6 | ||||
-rw-r--r-- | include/asm-x86/cputime_32.h | 6 | ||||
-rw-r--r-- | include/asm-x86/cputime_64.h | 6 | ||||
-rw-r--r-- | include/asm-x86/errno.h | 14 | ||||
-rw-r--r-- | include/asm-x86/errno_32.h | 6 | ||||
-rw-r--r-- | include/asm-x86/errno_64.h | 6 | ||||
-rw-r--r-- | include/asm-x86/resource.h | 14 | ||||
-rw-r--r-- | include/asm-x86/resource_32.h | 6 | ||||
-rw-r--r-- | include/asm-x86/resource_64.h | 6 | ||||
-rw-r--r-- | include/asm-x86/rtc.h | 6 | ||||
-rw-r--r-- | include/asm-x86/rtc_32.h | 10 | ||||
-rw-r--r-- | include/asm-x86/rtc_64.h | 10 | ||||
-rw-r--r-- | include/asm-x86/sections.h | 6 | ||||
-rw-r--r-- | include/asm-x86/sections_32.h | 7 | ||||
-rw-r--r-- | include/asm-x86/sections_64.h | 7 |
16 files changed, 5 insertions, 115 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index a0c0b80c7f2d..0618ca386ab1 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild | |||
@@ -22,8 +22,6 @@ unifdef-y += byteorder_32.h | |||
22 | unifdef-y += byteorder_64.h | 22 | unifdef-y += byteorder_64.h |
23 | unifdef-y += elf_32.h | 23 | unifdef-y += elf_32.h |
24 | unifdef-y += elf_64.h | 24 | unifdef-y += elf_64.h |
25 | unifdef-y += errno_32.h | ||
26 | unifdef-y += errno_64.h | ||
27 | unifdef-y += ioctls_32.h | 25 | unifdef-y += ioctls_32.h |
28 | unifdef-y += ioctls_64.h | 26 | unifdef-y += ioctls_64.h |
29 | unifdef-y += ipcbuf_32.h | 27 | unifdef-y += ipcbuf_32.h |
@@ -47,8 +45,6 @@ unifdef-y += posix_types_32.h | |||
47 | unifdef-y += posix_types_64.h | 45 | unifdef-y += posix_types_64.h |
48 | unifdef-y += ptrace_32.h | 46 | unifdef-y += ptrace_32.h |
49 | unifdef-y += ptrace_64.h | 47 | unifdef-y += ptrace_64.h |
50 | unifdef-y += resource_32.h | ||
51 | unifdef-y += resource_64.h | ||
52 | unifdef-y += sembuf_32.h | 48 | unifdef-y += sembuf_32.h |
53 | unifdef-y += sembuf_64.h | 49 | unifdef-y += sembuf_64.h |
54 | unifdef-y += setup_32.h | 50 | unifdef-y += setup_32.h |
diff --git a/include/asm-x86/cputime.h b/include/asm-x86/cputime.h index 87c37cf6b707..6d68ad7e0ea3 100644 --- a/include/asm-x86/cputime.h +++ b/include/asm-x86/cputime.h | |||
@@ -1,5 +1 @@ | |||
1 | #ifdef CONFIG_X86_32 | #include <asm-generic/cputime.h> | |
2 | # include "cputime_32.h" | ||
3 | #else | ||
4 | # include "cputime_64.h" | ||
5 | #endif | ||
diff --git a/include/asm-x86/cputime_32.h b/include/asm-x86/cputime_32.h deleted file mode 100644 index 398ed7cd171d..000000000000 --- a/include/asm-x86/cputime_32.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __I386_CPUTIME_H | ||
2 | #define __I386_CPUTIME_H | ||
3 | |||
4 | #include <asm-generic/cputime.h> | ||
5 | |||
6 | #endif /* __I386_CPUTIME_H */ | ||
diff --git a/include/asm-x86/cputime_64.h b/include/asm-x86/cputime_64.h deleted file mode 100644 index a07012dc5a3c..000000000000 --- a/include/asm-x86/cputime_64.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __X86_64_CPUTIME_H | ||
2 | #define __X86_64_CPUTIME_H | ||
3 | |||
4 | #include <asm-generic/cputime.h> | ||
5 | |||
6 | #endif /* __X86_64_CPUTIME_H */ | ||
diff --git a/include/asm-x86/errno.h b/include/asm-x86/errno.h index 9d511be8e573..4c82b503d92f 100644 --- a/include/asm-x86/errno.h +++ b/include/asm-x86/errno.h | |||
@@ -1,13 +1 @@ | |||
1 | #ifdef __KERNEL__ | #include <asm-generic/errno.h> | |
2 | # ifdef CONFIG_X86_32 | ||
3 | # include "errno_32.h" | ||
4 | # else | ||
5 | # include "errno_64.h" | ||
6 | # endif | ||
7 | #else | ||
8 | # ifdef __i386__ | ||
9 | # include "errno_32.h" | ||
10 | # else | ||
11 | # include "errno_64.h" | ||
12 | # endif | ||
13 | #endif | ||
diff --git a/include/asm-x86/errno_32.h b/include/asm-x86/errno_32.h deleted file mode 100644 index 969b34374728..000000000000 --- a/include/asm-x86/errno_32.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _I386_ERRNO_H | ||
2 | #define _I386_ERRNO_H | ||
3 | |||
4 | #include <asm-generic/errno.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-x86/errno_64.h b/include/asm-x86/errno_64.h deleted file mode 100644 index 311182129e32..000000000000 --- a/include/asm-x86/errno_64.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _X8664_ERRNO_H | ||
2 | #define _X8664_ERRNO_H | ||
3 | |||
4 | #include <asm-generic/errno.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-x86/resource.h b/include/asm-x86/resource.h index 732410a8c02a..04bc4db8921b 100644 --- a/include/asm-x86/resource.h +++ b/include/asm-x86/resource.h | |||
@@ -1,13 +1 @@ | |||
1 | #ifdef __KERNEL__ | #include <asm-generic/resource.h> | |
2 | # ifdef CONFIG_X86_32 | ||
3 | # include "resource_32.h" | ||
4 | # else | ||
5 | # include "resource_64.h" | ||
6 | # endif | ||
7 | #else | ||
8 | # ifdef __i386__ | ||
9 | # include "resource_32.h" | ||
10 | # else | ||
11 | # include "resource_64.h" | ||
12 | # endif | ||
13 | #endif | ||
diff --git a/include/asm-x86/resource_32.h b/include/asm-x86/resource_32.h deleted file mode 100644 index 6c1ea37c7718..000000000000 --- a/include/asm-x86/resource_32.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _I386_RESOURCE_H | ||
2 | #define _I386_RESOURCE_H | ||
3 | |||
4 | #include <asm-generic/resource.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-x86/resource_64.h b/include/asm-x86/resource_64.h deleted file mode 100644 index f40b40623234..000000000000 --- a/include/asm-x86/resource_64.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _X8664_RESOURCE_H | ||
2 | #define _X8664_RESOURCE_H | ||
3 | |||
4 | #include <asm-generic/resource.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-x86/rtc.h b/include/asm-x86/rtc.h index 1f0c98eb2e38..f71c3b0ed360 100644 --- a/include/asm-x86/rtc.h +++ b/include/asm-x86/rtc.h | |||
@@ -1,5 +1 @@ | |||
1 | #ifdef CONFIG_X86_32 | #include <asm-generic/rtc.h> | |
2 | # include "rtc_32.h" | ||
3 | #else | ||
4 | # include "rtc_64.h" | ||
5 | #endif | ||
diff --git a/include/asm-x86/rtc_32.h b/include/asm-x86/rtc_32.h deleted file mode 100644 index ffd02109a0e5..000000000000 --- a/include/asm-x86/rtc_32.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef _I386_RTC_H | ||
2 | #define _I386_RTC_H | ||
3 | |||
4 | /* | ||
5 | * x86 uses the default access methods for the RTC. | ||
6 | */ | ||
7 | |||
8 | #include <asm-generic/rtc.h> | ||
9 | |||
10 | #endif | ||
diff --git a/include/asm-x86/rtc_64.h b/include/asm-x86/rtc_64.h deleted file mode 100644 index 18ed713ac7de..000000000000 --- a/include/asm-x86/rtc_64.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef _X86_64_RTC_H | ||
2 | #define _X86_64_RTC_H | ||
3 | |||
4 | /* | ||
5 | * x86 uses the default access methods for the RTC. | ||
6 | */ | ||
7 | |||
8 | #include <asm-generic/rtc.h> | ||
9 | |||
10 | #endif | ||
diff --git a/include/asm-x86/sections.h b/include/asm-x86/sections.h index ae6c69d9be3f..2b8c5160388f 100644 --- a/include/asm-x86/sections.h +++ b/include/asm-x86/sections.h | |||
@@ -1,5 +1 @@ | |||
1 | #ifdef CONFIG_X86_32 | #include <asm-generic/sections.h> | |
2 | # include "sections_32.h" | ||
3 | #else | ||
4 | # include "sections_64.h" | ||
5 | #endif | ||
diff --git a/include/asm-x86/sections_32.h b/include/asm-x86/sections_32.h deleted file mode 100644 index 2dcbb92918b2..000000000000 --- a/include/asm-x86/sections_32.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef _I386_SECTIONS_H | ||
2 | #define _I386_SECTIONS_H | ||
3 | |||
4 | /* nothing to see, move along */ | ||
5 | #include <asm-generic/sections.h> | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-x86/sections_64.h b/include/asm-x86/sections_64.h deleted file mode 100644 index c746d9f1e70c..000000000000 --- a/include/asm-x86/sections_64.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef _X8664_SECTIONS_H | ||
2 | #define _X8664_SECTIONS_H | ||
3 | |||
4 | /* nothing to see, move along */ | ||
5 | #include <asm-generic/sections.h> | ||
6 | |||
7 | #endif | ||