Skip to contentSkip to conversation

x86: trivial header merges

PATCH New Brian Gerst 1 participant 1 message Oct 13, 2007

lore
Share & tools
lore

Brian Gerst

author
#0 lore raw

PATCH 1/1 x86: trivial header merges

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

Signed-off-by Brian Gerst <[email protected]>
---
 include/asm-x86/cputime.h     |    6 +-----
 include/asm-x86/cputime_32.h  |    6 ------
 include/asm-x86/cputime_64.h  |    6 ------
 include/asm-x86/errno.h       |   14 +-------------
 include/asm-x86/errno_32.h    |    6 ------
 include/asm-x86/errno_64.h    |    6 ------
 include/asm-x86/resource.h    |   14 +-------------
 include/asm-x86/resource_32.h |    6 ------
 include/asm-x86/resource_64.h |    6 ------
 include/asm-x86/rtc.h         |    6 +-----
 include/asm-x86/rtc_32.h      |   10 ----------
 include/asm-x86/rtc_64.h      |   10 ----------
 include/asm-x86/sections.h    |    6 +-----
 include/asm-x86/sections_32.h |    7 -------
 include/asm-x86/sections_64.h |    7 -------
 15 files changed, 5 insertions(+), 111 deletions(-)
 delete mode 100644 include/asm-x86/cputime_32.h
 delete mode 100644 include/asm-x86/cputime_64.h
 delete mode 100644 include/asm-x86/errno_32.h
 delete mode 100644 include/asm-x86/errno_64.h
 delete mode 100644 include/asm-x86/resource_32.h
 delete mode 100644 include/asm-x86/resource_64.h
 delete mode 100644 include/asm-x86/rtc_32.h
 delete mode 100644 include/asm-x86/rtc_64.h
 delete mode 100644 include/asm-x86/sections_32.h
 delete mode 100644 include/asm-x86/sections_64.h
include/asm-x86/cputime.h +1 -5
index 87c37cf..6d68ad7 100644
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "cputime_32.h"
-#else
-# include "cputime_64.h"
-#endif
+#include <asm-generic/cputime.h>
include/asm-x86/cputime_32.h deleted +0 -6
deleted file mode 100644
index 398ed7c..0000000
@@ -1,6 +0,0 @@
-#ifndef __I386_CPUTIME_H
-#define __I386_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __I386_CPUTIME_H */
include/asm-x86/cputime_64.h deleted +0 -6
deleted file mode 100644
index a07012d..0000000
@@ -1,6 +0,0 @@
-#ifndef __X86_64_CPUTIME_H
-#define __X86_64_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __X86_64_CPUTIME_H */
include/asm-x86/errno.h +1 -13
index 9d511be..4c82b50 100644
@@ -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>
include/asm-x86/errno_32.h deleted +0 -6
deleted file mode 100644
index 969b343..0000000
@@ -1,6 +0,0 @@
-#ifndef _I386_ERRNO_H
-#define _I386_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
include/asm-x86/errno_64.h deleted +0 -6
deleted file mode 100644
index 3111821..0000000
@@ -1,6 +0,0 @@
-#ifndef _X8664_ERRNO_H
-#define _X8664_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
include/asm-x86/resource.h +1 -13
index 732410a..04bc4db 100644
@@ -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>
include/asm-x86/resource_32.h deleted +0 -6
deleted file mode 100644
index 6c1ea37..0000000
@@ -1,6 +0,0 @@
-#ifndef _I386_RESOURCE_H
-#define _I386_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
include/asm-x86/resource_64.h deleted +0 -6
deleted file mode 100644
index f40b406..0000000
@@ -1,6 +0,0 @@
-#ifndef _X8664_RESOURCE_H
-#define _X8664_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
include/asm-x86/rtc.h +1 -5
index 1f0c98e..f71c3b0 100644
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "rtc_32.h"
-#else
-# include "rtc_64.h"
-#endif
+#include <asm-generic/rtc.h>
include/asm-x86/rtc_32.h deleted +0 -10
deleted file mode 100644
index ffd0210..0000000
@@ -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
include/asm-x86/rtc_64.h deleted +0 -10
deleted file mode 100644
index 18ed713..0000000
@@ -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
include/asm-x86/sections.h +1 -5
index ae6c69d..2b8c516 100644
@@ -1,5 +1 @@
-#ifdef CONFIG_X86_32
-# include "sections_32.h"
-#else
-# include "sections_64.h"
-#endif
+#include <asm-generic/sections.h>
include/asm-x86/sections_32.h deleted +0 -7
deleted file mode 100644
index 2dcbb92..0000000
@@ -1,7 +0,0 @@
-#ifndef _I386_SECTIONS_H
-#define _I386_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
include/asm-x86/sections_64.h deleted +0 -7
deleted file mode 100644
index c746d9f..0000000
@@ -1,7 +0,0 @@
-#ifndef _X8664_SECTIONS_H
-#define _X8664_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
Signature · 1 line
1.5.3.GIT