diff options
author | Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
commit | a61944c251c3e68c4bbf6eb96ff61c7b286351c5 (patch) | |
tree | fd9f82297805d043a45a828626dfd29bddc48b00 /arch/powerpc/mm/stab.c | |
parent | ac9a126571e76abec76e1c1f46672e82501eab1e (diff) | |
parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
download | op-kernel-dev-a61944c251c3e68c4bbf6eb96ff61c7b286351c5.zip op-kernel-dev-a61944c251c3e68c4bbf6eb96ff61c7b286351c5.tar.gz |
Merge commit 'v3.0-rc1' into kbuild/kconfig
Diffstat (limited to 'arch/powerpc/mm/stab.c')
-rw-r--r-- | arch/powerpc/mm/stab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c index 446a018..41e3164 100644 --- a/arch/powerpc/mm/stab.c +++ b/arch/powerpc/mm/stab.c @@ -243,7 +243,7 @@ void __init stabs_alloc(void) { int cpu; - if (cpu_has_feature(CPU_FTR_SLB)) + if (mmu_has_feature(MMU_FTR_SLB)) return; for_each_possible_cpu(cpu) { |