diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-11-30 11:46:22 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 20:41:59 +1100 |
| commit | 0470466dbafd1db0815bb884d26a6be431e19f96 (patch) | |
| tree | e40c7ba8c3687dd33c09a137ecb06c5f9dccdb5e /arch/powerpc/mm | |
| parent | 80814be40e1f0e7e6fc00fdfe0af16268670e0b4 (diff) | |
| download | op-kernel-dev-0470466dbafd1db0815bb884d26a6be431e19f96.zip op-kernel-dev-0470466dbafd1db0815bb884d26a6be431e19f96.tar.gz | |
[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 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 1915661..c0d2a69 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -277,7 +277,7 @@ static void __init htab_init_page_sizes(void) * Not in the device-tree, let's fallback on known size * list for 16M capable GP & GR */ - if (cpu_has_feature(CPU_FTR_16M_PAGE) && !machine_is(iseries)) + if (cpu_has_feature(CPU_FTR_16M_PAGE)) memcpy(mmu_psize_defs, mmu_psize_defaults_gp, sizeof(mmu_psize_defaults_gp)); found: |
