diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-05-08 00:31:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:13 -0700 |
| commit | 6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630 (patch) | |
| tree | ebf36c4c218a1b6beeffc2e63340059069a036c3 /include/linux | |
| parent | 8e39c933b1b7df501dbb68879fb1640e277b8a5c (diff) | |
| download | linux-6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630.tar.gz linux-6df95fd7ad9a842c1688d2b83bdcb7c82e9c8630.tar.bz2 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/linux')
| -rw-r--r-- | include/linux/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/const.h | 19 |
2 files changed, 20 insertions, 0 deletions
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/linux/const.h b/include/linux/const.h new file mode 100644 index 000000000000..07b300bfe34b --- /dev/null +++ b/include/linux/const.h @@ -0,0 +1,19 @@ +/* const.h: Macros for dealing with constants. */ + +#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 specifiers 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 /* !(_LINUX_CONST_H) */ |