diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-01 10:37:25 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-01 10:37:25 +1000 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/powerpc/platforms/pseries/setup.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
| download | op-kernel-dev-57cad8084e0837e0f2c97da789ec9b3f36809be9.zip op-kernel-dev-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.gz | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 927e0a4..de214d8 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -501,7 +501,8 @@ static void pseries_dedicated_idle_sleep(void) } /* - * Cede if the other thread is not idle, so that it can + * If not SMT, cede processor. If CPU is running SMT + * cede if the other thread is not idle, so that it can * go single-threaded. If the other thread is idle, * we ask the hypervisor if it has pending work it * wants to do and cede if it does. Otherwise we keep @@ -514,7 +515,8 @@ static void pseries_dedicated_idle_sleep(void) * very low priority. The cede enables interrupts, which * doesn't matter here. */ - if (!lppaca[cpu ^ 1].idle || poll_pending() == H_PENDING) + if (!cpu_has_feature(CPU_FTR_SMT) || !lppaca[cpu ^ 1].idle + || poll_pending() == H_PENDING) cede_processor(); out: |
