aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/shmparam.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-15 07:57:47 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 14:17:10 -0400
commit003a46cfff308ee0d879dfa89b9a7c65b2a481bf (patch)
tree234552110912d4b9d6519474823e98e1a1726d16 /include/asm-x86/shmparam.h
parent217d115cd5d7d2bef7db7839b93ce5dc2867c392 (diff)
x86: unify some more trivial include/asm-x86/ 32/64 variants
Scripted unification. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/shmparam.h')
-rw-r--r--include/asm-x86/shmparam.h19
1 files changed, 6 insertions, 13 deletions
diff --git a/include/asm-x86/shmparam.h b/include/asm-x86/shmparam.h
index 165627cc5345..0880cf0917b9 100644
--- a/include/asm-x86/shmparam.h
+++ b/include/asm-x86/shmparam.h
@@ -1,13 +1,6 @@
1#ifdef __KERNEL__ 1#ifndef _ASM_X86_SHMPARAM_H
2# ifdef CONFIG_X86_32 2#define _ASM_X86_SHMPARAM_H
3# include "shmparam_32.h" 3
4# else 4#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
5# include "shmparam_64.h" 5
6# endif 6#endif /* _ASM_X86_SHMPARAM_H */
7#else
8# ifdef __i386__
9# include "shmparam_32.h"
10# else
11# include "shmparam_64.h"
12# endif
13#endif