git.samba.org
/
sfrench
/
cifs-2.6.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 master.kernel.org:/pub/scm/linux/kernel/git/cooloney...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
smp.c
diff --git
a/arch/ia64/kernel/smp.c
b/arch/ia64/kernel/smp.c
index 9f72838db26ec52c8c0fce68f31e7f6c8b032dbb..0982882bfb80ae6cd2390045eaad15f468a94890 100644
(file)
--- a/
arch/ia64/kernel/smp.c
+++ b/
arch/ia64/kernel/smp.c
@@
-468,7
+468,7
@@
smp_send_stop (void)
send_IPI_allbutself(IPI_CPU_STOP);
}
-int
__init
+int
setup_profiling_timer (unsigned int multiplier)
{
return -EINVAL;