diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-15 14:18:00 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-20 20:16:11 -0400 |
commit | f5339277eb8d3aed37f12a27988366f68ab68930 (patch) | |
tree | 4b8f14bb6144b128a2d3741aad21bfe24ba15b0d /arch/powerpc/mm/slb.c | |
parent | ec86b45af464d2d3c00d1125b220d6c3b6ca93d8 (diff) |
powerpc: Remove FW_FEATURE ISERIES from arch code
This is no longer selectable, so just remove all the dependent code.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm/slb.c')
-rw-r--r-- | arch/powerpc/mm/slb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index e22276cb67a4..a538c80db2df 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/cputable.h> | 21 | #include <asm/cputable.h> |
22 | #include <asm/cacheflush.h> | 22 | #include <asm/cacheflush.h> |
23 | #include <asm/smp.h> | 23 | #include <asm/smp.h> |
24 | #include <asm/firmware.h> | ||
25 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
26 | #include <asm/udbg.h> | 25 | #include <asm/udbg.h> |
27 | #include <asm/code-patching.h> | 26 | #include <asm/code-patching.h> |
@@ -307,11 +306,6 @@ void slb_initialize(void) | |||
307 | 306 | ||
308 | get_paca()->stab_rr = SLB_NUM_BOLTED; | 307 | get_paca()->stab_rr = SLB_NUM_BOLTED; |
309 | 308 | ||
310 | /* On iSeries the bolted entries have already been set up by | ||
311 | * the hypervisor from the lparMap data in head.S */ | ||
312 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | ||
313 | return; | ||
314 | |||
315 | lflags = SLB_VSID_KERNEL | linear_llp; | 309 | lflags = SLB_VSID_KERNEL | linear_llp; |
316 | vflags = SLB_VSID_KERNEL | vmalloc_llp; | 310 | vflags = SLB_VSID_KERNEL | vmalloc_llp; |
317 | 311 | ||