From 27cb4eac26f2e8ce66b69c7b92bfafcc65c7feb7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Sun, 2 Apr 2006 02:45:04 +1000 Subject: [PATCH] --- yaml --- r: 25048 b: refs/heads/master c: 856d08ec46c5ecf3df13827c492fb6998fdc8322 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/setup_64.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 34a7d976e2bc..82c7e99d6955 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c6967750a6f1e206a44ab5cf43c36aacb91372b +refs/heads/master: 856d08ec46c5ecf3df13827c492fb6998fdc8322 diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c index 59aa92cd6fa4..13e91c4d70a8 100644 --- a/trunk/arch/powerpc/kernel/setup_64.c +++ b/trunk/arch/powerpc/kernel/setup_64.c @@ -215,12 +215,10 @@ void __init early_setup(unsigned long dt_ptr) /* * Initialize stab / SLB management except on iSeries */ - if (!firmware_has_feature(FW_FEATURE_ISERIES)) { - if (cpu_has_feature(CPU_FTR_SLB)) - slb_initialize(); - else - stab_initialize(get_paca()->stab_real); - } + if (cpu_has_feature(CPU_FTR_SLB)) + slb_initialize(); + else if (!firmware_has_feature(FW_FEATURE_ISERIES)) + stab_initialize(get_paca()->stab_real); DBG(" <- early_setup()\n"); }