aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-11-29 19:46:22 -0500
committerPaul Mackerras <paulus@samba.org>2006-12-04 04:41:59 -0500
commit0470466dbafd1db0815bb884d26a6be431e19f96 (patch)
treee40c7ba8c3687dd33c09a137ecb06c5f9dccdb5e /include
parent80814be40e1f0e7e6fc00fdfe0af16268670e0b4 (diff)
[POWERPC] Fix cputable.h for combined build
Remove CPU_FTR_16M_PAGE from the cupfeatures mask at runtime on iSeries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/cputable.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 354f66da9dcf..6fe5c9d4ca3b 100644
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -155,16 +155,9 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start,
155 155
156#ifndef __ASSEMBLY__ 156#ifndef __ASSEMBLY__
157 157
158#define CPU_FTR_PPCAS_ARCH_V2_BASE (CPU_FTR_SLB | \ 158#define CPU_FTR_PPCAS_ARCH_V2 (CPU_FTR_SLB | \
159 CPU_FTR_TLBIEL | CPU_FTR_NOEXECUTE | \ 159 CPU_FTR_TLBIEL | CPU_FTR_NOEXECUTE | \
160 CPU_FTR_NODSISRALIGN) 160 CPU_FTR_NODSISRALIGN | CPU_FTR_16M_PAGE)
161
162/* iSeries doesn't support large pages */
163#ifdef CONFIG_PPC_ISERIES
164#define CPU_FTR_PPCAS_ARCH_V2 (CPU_FTR_PPCAS_ARCH_V2_BASE)
165#else
166#define CPU_FTR_PPCAS_ARCH_V2 (CPU_FTR_PPCAS_ARCH_V2_BASE | CPU_FTR_16M_PAGE)
167#endif /* CONFIG_PPC_ISERIES */
168 161
169/* We only set the altivec features if the kernel was compiled with altivec 162/* We only set the altivec features if the kernel was compiled with altivec
170 * support 163 * support