From 6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 8 May 2007 00:31:11 -0700 Subject: [PATCH] consolidate asm/const.h to linux/const.h Make a global linux/const.h header file instead of having multiple, per-arch files, and convert current users of asm/const.h to use linux/const.h. Built on x86_64 and sparc64. [akpm@linux-foundation.org: fix include/asm-x86_64/Kbuild] Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-sparc64/Kbuild | 1 - include/asm-sparc64/const.h | 19 ------------------- include/asm-sparc64/lsu.h | 2 +- include/asm-sparc64/mmu.h | 2 +- include/asm-sparc64/page.h | 2 +- include/asm-sparc64/pgtable.h | 2 +- include/asm-sparc64/pstate.h | 2 +- include/asm-sparc64/sfafsr.h | 2 +- include/asm-x86_64/Kbuild | 1 - include/asm-x86_64/page.h | 2 +- include/asm-x86_64/pgtable.h | 2 +- include/linux/Kbuild | 1 + include/{asm-x86_64 => linux}/const.h | 9 ++++----- 13 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 include/asm-sparc64/const.h rename include/{asm-x86_64 => linux}/const.h (70%) diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild index a7f44408c93b..854fd3a65acf 100644 --- a/include/asm-sparc64/Kbuild +++ b/include/asm-sparc64/Kbuild @@ -8,7 +8,6 @@ header-y += apb.h header-y += asi.h header-y += bbc.h header-y += bpp.h -header-y += const.h header-y += display7seg.h header-y += envctrl.h header-y += ipc.h diff --git a/include/asm-sparc64/const.h b/include/asm-sparc64/const.h deleted file mode 100644 index 8ad902b2ce04..000000000000 --- a/include/asm-sparc64/const.h +++ /dev/null @@ -1,19 +0,0 @@ -/* const.h: Macros for dealing with constants. */ - -#ifndef _SPARC64_CONST_H -#define _SPARC64_CONST_H - -/* Some constant macros are used in both assembler and - * C code. Therefore we cannot annotate them always with - * 'UL' and other type specificers unilaterally. We - * use the following macros to deal with this. - */ - -#ifdef __ASSEMBLY__ -#define _AC(X,Y) X -#else -#define _AC(X,Y) (X##Y) -#endif - - -#endif /* !(_SPARC64_CONST_H) */ diff --git a/include/asm-sparc64/lsu.h b/include/asm-sparc64/lsu.h index e5329c7f5833..79f109840c39 100644 --- a/include/asm-sparc64/lsu.h +++ b/include/asm-sparc64/lsu.h @@ -2,7 +2,7 @@ #ifndef _SPARC64_LSU_H #define _SPARC64_LSU_H -#include +#include /* LSU Control Register */ #define LSU_CONTROL_PM _AC(0x000001fe00000000,UL) /* Phys-watchpoint byte mask*/ diff --git a/include/asm-sparc64/mmu.h b/include/asm-sparc64/mmu.h index 70af4b6ce136..8abc58f0f9d7 100644 --- a/include/asm-sparc64/mmu.h +++ b/include/asm-sparc64/mmu.h @@ -1,8 +1,8 @@ #ifndef __MMU_H #define __MMU_H +#include #include -#include #include #define CTX_NR_BITS 13 diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index ff736eafa64d..7af1077451ff 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h @@ -5,7 +5,7 @@ #ifdef __KERNEL__ -#include +#include #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB) #define PAGE_SHIFT 13 diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 46705ef47d27..9e80ad43b29c 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -15,13 +15,13 @@ #include #include +#include #include #include #include #include #include #include -#include /* The kernel image occupies 0x4000000 to 0x1000000 (4MB --> 32MB). * The page copy blockops can use 0x2000000 to 0x4000000. diff --git a/include/asm-sparc64/pstate.h b/include/asm-sparc64/pstate.h index 49a7924a89ab..f3c45484c636 100644 --- a/include/asm-sparc64/pstate.h +++ b/include/asm-sparc64/pstate.h @@ -2,7 +2,7 @@ #ifndef _SPARC64_PSTATE_H #define _SPARC64_PSTATE_H -#include +#include /* The V9 PSTATE Register (with SpitFire extensions). * diff --git a/include/asm-sparc64/sfafsr.h b/include/asm-sparc64/sfafsr.h index 2f792c20b53c..e96137b04a4f 100644 --- a/include/asm-sparc64/sfafsr.h +++ b/include/asm-sparc64/sfafsr.h @@ -1,7 +1,7 @@ #ifndef _SPARC64_SFAFSR_H #define _SPARC64_SFAFSR_H -#include +#include /* Spitfire Asynchronous Fault Status register, ASI=0x4C VA<63:0>=0x0 */ diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild index 89ad1fc27c8b..75a2deffca68 100644 --- a/include/asm-x86_64/Kbuild +++ b/include/asm-x86_64/Kbuild @@ -19,4 +19,3 @@ unifdef-y += mce.h unifdef-y += msr.h unifdef-y += mtrr.h unifdef-y += vsyscall.h -unifdef-y += const.h diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h index 4d04e2479569..d7b101bb4a5f 100644 --- a/include/asm-x86_64/page.h +++ b/include/asm-x86_64/page.h @@ -1,7 +1,7 @@ #ifndef _X86_64_PAGE_H #define _X86_64_PAGE_H -#include +#include /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h index b21083891ce8..4e86aca57aea 100644 --- a/include/asm-x86_64/pgtable.h +++ b/include/asm-x86_64/pgtable.h @@ -1,7 +1,7 @@ #ifndef _X86_64_PGTABLE_H #define _X86_64_PGTABLE_H -#include +#include #ifndef __ASSEMBLY__ /* diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 2c2b6fc91e30..d61983db4149 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -45,6 +45,7 @@ header-y += coda_psdev.h header-y += coff.h header-y += comstats.h header-y += consolemap.h +header-y += const.h header-y += cycx_cfm.h header-y += dlm_device.h header-y += dm-ioctl.h diff --git a/include/asm-x86_64/const.h b/include/linux/const.h similarity index 70% rename from include/asm-x86_64/const.h rename to include/linux/const.h index 54fb08f3db9b..07b300bfe34b 100644 --- a/include/asm-x86_64/const.h +++ b/include/linux/const.h @@ -1,11 +1,11 @@ /* const.h: Macros for dealing with constants. */ -#ifndef _X86_64_CONST_H -#define _X86_64_CONST_H +#ifndef _LINUX_CONST_H +#define _LINUX_CONST_H /* Some constant macros are used in both assembler and * C code. Therefore we cannot annotate them always with - * 'UL' and other type specificers unilaterally. We + * 'UL' and other type specifiers unilaterally. We * use the following macros to deal with this. */ @@ -16,5 +16,4 @@ #define _AC(X,Y) __AC(X,Y) #endif - -#endif /* !(_X86_64_CONST_H) */ +#endif /* !(_LINUX_CONST_H) */