git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
microblaze
/
kernel
/
process.c
diff --git
a/arch/microblaze/kernel/process.c
b/arch/microblaze/kernel/process.c
index
812f1bf
..
09bed44
100644
(file)
--- a/
arch/microblaze/kernel/process.c
+++ b/
arch/microblaze/kernel/process.c
@@
-15,6
+15,7
@@
#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/pgalloc.h>
#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/pgalloc.h>
+#include <asm/uaccess.h> /* for USER_DS macros */
#include <asm/cacheflush.h>
void show_regs(struct pt_regs *regs)
#include <asm/cacheflush.h>
void show_regs(struct pt_regs *regs)
@@
-74,7
+75,10
@@
__setup("hlt", hlt_setup);
void default_idle(void)
{
void default_idle(void)
{
- if (!hlt_counter) {
+ if (likely(hlt_counter)) {
+ while (!need_resched())
+ cpu_relax();
+ } else {
clear_thread_flag(TIF_POLLING_NRFLAG);
smp_mb__after_clear_bit();
local_irq_disable();
clear_thread_flag(TIF_POLLING_NRFLAG);
smp_mb__after_clear_bit();
local_irq_disable();
@@
-82,9
+86,7
@@
void default_idle(void)
cpu_sleep();
local_irq_enable();
set_thread_flag(TIF_POLLING_NRFLAG);
cpu_sleep();
local_irq_enable();
set_thread_flag(TIF_POLLING_NRFLAG);
- } else
- while (!need_resched())
- cpu_relax();
+ }
}
void cpu_idle(void)
}
void cpu_idle(void)