[tip:x86/setup] x86, setup: move isdigit.h to ctype.h, header files on top.
in [Kernel]
|
Prev: linux-next: manual merge of the xen tree with the swiotlb tree
Next: [PATCH 2/2]drivers/usb/host/ehci-hub.c Fix variable 'i' set but not used
From: tip-bot for H. Peter Anvin on 3 Aug 2010 00:20 Commit-ID: 6238b47b58480cd9c092600c05338dbe261b71ce Gitweb: http://git.kernel.org/tip/6238b47b58480cd9c092600c05338dbe261b71ce Author: H. Peter Anvin <hpa(a)zytor.com> AuthorDate: Mon, 2 Aug 2010 21:03:46 -0700 Committer: H. Peter Anvin <hpa(a)zytor.com> CommitDate: Mon, 2 Aug 2010 21:07:20 -0700 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(a)zytor.com> LKML-Reference: <4C5752F2.8030206(a)kernel.org> --- arch/x86/boot/boot.h | 3 +-- arch/x86/boot/compressed/misc.h | 1 + arch/x86/boot/compressed/string.c | 2 -- arch/x86/boot/{isdigit.h => ctype.h} | 0 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 00cf51c..c7093bd 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 a267849..3f19c81 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 7995c6a..19b3e69 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 similarity index 100% rename from arch/x86/boot/isdigit.h rename to arch/x86/boot/ctype.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |