diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-08-02 21:03:46 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-08-02 21:07:20 -0700 |
| commit | 6238b47b58480cd9c092600c05338dbe261b71ce (patch) | |
| tree | 83055587295af222003e505c52ea3dbae3e0c3aa | |
| parent | 8fee13a48e4879fba57725f6d9513df4bfa8e9f3 (diff) | |
x86, setup: move isdigit.h to ctype.h, header files on top.
It is a subset of <ctype.h> functionality, so name it ctype.h. Also,
reorganize header files so #include statements are clustered near the
top as they should be.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
LKML-Reference: <4C5752F2.8030206@kernel.org>
| -rw-r--r-- | arch/x86/boot/boot.h | 3 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/misc.h | 1 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/string.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/ctype.h (renamed from arch/x86/boot/isdigit.h) | 0 |
4 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 00cf51cfc2e6..c7093bd9f2d3 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -28,6 +28,7 @@ #include "bitops.h" #include <asm/cpufeature.h> #include <asm/processor-flags.h> +#include "ctype.h" /* Useful macros */ #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) @@ -200,8 +201,6 @@ static inline int memcmp_gs(const void *s1, addr_t s2, size_t len) return diff; } -#include "isdigit.h" - /* Heap -- available for dynamic lists. */ extern char _end[]; extern char *HEAP; diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index a267849ac1c9..3f19c81a6203 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -20,6 +20,7 @@ #include <asm/bootparam.h> #define BOOT_BOOT_H +#include "../ctype.h" /* misc.c */ extern struct boot_params *real_mode; /* Pointer to real-mode data */ diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c index 7995c6a49509..19b3e693cd72 100644 --- a/arch/x86/boot/compressed/string.c +++ b/arch/x86/boot/compressed/string.c @@ -1,4 +1,2 @@ #include "misc.h" - -#include "../isdigit.h" #include "../string.c" diff --git a/arch/x86/boot/isdigit.h b/arch/x86/boot/ctype.h index 25e13403193c..25e13403193c 100644 --- a/arch/x86/boot/isdigit.h +++ b/arch/x86/boot/ctype.h |