projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-block.git]
/
include
/
linux
/
cpu.h
diff --git
a/include/linux/cpu.h
b/include/linux/cpu.h
index d612b89dce3320db7d4edafe02dde8d50f8def56..08d50c53aab401ef79c20e85213027d854e5d199 100644
(file)
--- a/
include/linux/cpu.h
+++ b/
include/linux/cpu.h
@@
-74,7
+74,6
@@
extern int lock_cpu_hotplug_interruptible(void);
register_cpu_notifier(&fn##_nb); \
}
int cpu_down(unsigned int cpu);
-extern int __attribute__((weak)) smp_prepare_cpu(int cpu);
#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
#else
#define lock_cpu_hotplug() do { } while (0)