git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
process.c
diff --git
a/arch/ia64/kernel/process.c
b/arch/ia64/kernel/process.c
index
355d579
..
ea914cc
100644
(file)
--- a/
arch/ia64/kernel/process.c
+++ b/
arch/ia64/kernel/process.c
@@
-9,7
+9,6
@@
* Add notify_die() hooks.
*/
#define __KERNEL_SYSCALLS__ /* see <asm/unistd.h> */
* Add notify_die() hooks.
*/
#define __KERNEL_SYSCALLS__ /* see <asm/unistd.h> */
-#include <linux/config.h>
#include <linux/cpu.h>
#include <linux/pm.h>
#include <linux/cpu.h>
#include <linux/pm.h>
@@
-272,9
+271,9
@@
cpu_idle (void)
/* endless idle loop with no priority at all */
while (1) {
if (can_do_pal_halt)
/* endless idle loop with no priority at all */
while (1) {
if (can_do_pal_halt)
- c
lear_thread_flag(TIF_POLLING_NRFLAG)
;
+ c
urrent_thread_info()->status &= ~TS_POLLING
;
else
else
-
set_thread_flag(TIF_POLLING_NRFLAG)
;
+
current_thread_info()->status |= TS_POLLING
;
if (!need_resched()) {
void (*idle)(void);
if (!need_resched()) {
void (*idle)(void);