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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
include
/
linux
/
stop_machine.h
diff --git
a/include/linux/stop_machine.h
b/include/linux/stop_machine.h
index
6b524a0
..
1808960
100644
(file)
--- a/
include/linux/stop_machine.h
+++ b/
include/linux/stop_machine.h
@@
-126,8
+126,8
@@
int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus);
#else /* CONFIG_STOP_MACHINE && CONFIG_SMP */
#else /* CONFIG_STOP_MACHINE && CONFIG_SMP */
-static inline int stop_machine(int (*fn)(void *), void *data,
- const struct cpumask *cpus)
+static inline int
__
stop_machine(int (*fn)(void *), void *data,
+
const struct cpumask *cpus)
{
int ret;
local_irq_disable();
{
int ret;
local_irq_disable();
@@
-136,5
+136,11
@@
static inline int stop_machine(int (*fn)(void *), void *data,
return ret;
}
return ret;
}
+static inline int stop_machine(int (*fn)(void *), void *data,
+ const struct cpumask *cpus)
+{
+ return __stop_machine(fn, data, cpus);
+}
+
#endif /* CONFIG_STOP_MACHINE && CONFIG_SMP */
#endif /* _LINUX_STOP_MACHINE */
#endif /* CONFIG_STOP_MACHINE && CONFIG_SMP */
#endif /* _LINUX_STOP_MACHINE */