diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-05-08 09:31:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:15:13 +0200 |
| commit | 6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630 (patch) | |
| tree | ebf36c4c218a1b6beeffc2e63340059069a036c3 /include/asm-x86_64 | |
| parent | tpm: fix sleep-in-spinlock (diff) | |
| download | linux-6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630.tar.xz linux-6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630.zip | |
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 <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/Kbuild | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/const.h | 20 | ||||
| -rw-r--r-- | include/asm-x86_64/page.h | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/pgtable.h | 2 |
4 files changed, 2 insertions, 23 deletions
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/const.h b/include/asm-x86_64/const.h deleted file mode 100644 index 54fb08f3db9b..000000000000 --- a/include/asm-x86_64/const.h +++ /dev/null @@ -1,20 +0,0 @@ -/* const.h: Macros for dealing with constants. */ - -#ifndef _X86_64_CONST_H -#define _X86_64_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) -#define _AC(X,Y) __AC(X,Y) -#endif - - -#endif /* !(_X86_64_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 <asm/const.h> +#include <linux/const.h> /* 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 <asm/const.h> +#include <linux/const.h> #ifndef __ASSEMBLY__ /* |