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 tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
smp_plat.h
diff --git
a/arch/arm/include/asm/smp_plat.h
b/arch/arm/include/asm/smp_plat.h
index 993e5224d8f7eeeb09f4c2a5358a97073c67c3a6..f9080717fc88c6dd4f3e79e40a426de22100d8db 100644
(file)
--- a/
arch/arm/include/asm/smp_plat.h
+++ b/
arch/arm/include/asm/smp_plat.h
@@
-107,4
+107,13
@@
static inline u32 mpidr_hash_size(void)
extern int platform_can_secondary_boot(void);
extern int platform_can_cpu_hotplug(void);
extern int platform_can_secondary_boot(void);
extern int platform_can_cpu_hotplug(void);
+#ifdef CONFIG_HOTPLUG_CPU
+extern int platform_can_hotplug_cpu(unsigned int cpu);
+#else
+static inline int platform_can_hotplug_cpu(unsigned int cpu)
+{
+ return 0;
+}
+#endif
+
#endif
#endif