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
/
powerpc
/
kernel
/
smp-tbsync.c
diff --git
a/arch/powerpc/kernel/smp-tbsync.c
b/arch/powerpc/kernel/smp-tbsync.c
index
9adef3b
..
de59c6c
100644
(file)
--- a/
arch/powerpc/kernel/smp-tbsync.c
+++ b/
arch/powerpc/kernel/smp-tbsync.c
@@
-5,7
+5,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
@@
-46,8
+45,9
@@
void __devinit smp_generic_take_timebase(void)
{
int cmd;
u64 tb;
{
int cmd;
u64 tb;
+ unsigned long flags;
- local_irq_
disable(
);
+ local_irq_
save(flags
);
while (!running)
barrier();
rmb();
while (!running)
barrier();
rmb();
@@
-71,7
+71,7
@@
void __devinit smp_generic_take_timebase(void)
set_tb(tb >> 32, tb & 0xfffffffful);
enter_contest(tbsync->mark, -1);
}
set_tb(tb >> 32, tb & 0xfffffffful);
enter_contest(tbsync->mark, -1);
}
- local_irq_
enable(
);
+ local_irq_
restore(flags
);
}
static int __devinit start_contest(int cmd, long offset, int num)
}
static int __devinit start_contest(int cmd, long offset, int num)