git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
[safe/jmp/linux-2.6]
/
kernel
/
up.c
diff --git
a/kernel/up.c
b/kernel/up.c
index
ce62cc9
..
1ff27a2
100644
(file)
--- a/
kernel/up.c
+++ b/
kernel/up.c
@@
-2,6
+2,7
@@
* Uniprocessor-only support functions. The counterpart to kernel/smp.c
*/
* Uniprocessor-only support functions. The counterpart to kernel/smp.c
*/
+#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/smp.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/smp.h>
@@
-9,10
+10,12
@@
int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
int wait)
{
int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
int wait)
{
- WARN_ON(cpuid != 0);
+ WARN_ON(cpu != 0);
+
local_irq_disable();
(func)(info);
local_irq_enable();
local_irq_disable();
(func)(info);
local_irq_enable();
+
return 0;
}
EXPORT_SYMBOL(smp_call_function_single);
return 0;
}
EXPORT_SYMBOL(smp_call_function_single);