projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
i386
/
kernel
/
topology.c
diff --git
a/arch/i386/kernel/topology.c
b/arch/i386/kernel/topology.c
index
07d6da3
..
4578235
100644
(file)
--- a/
arch/i386/kernel/topology.c
+++ b/
arch/i386/kernel/topology.c
@@
-1,5
+1,5
@@
/*
/*
- * arch/i386/kernel/topology.c - Populate
driver
fs with topology information
+ * arch/i386/kernel/topology.c - Populate
sys
fs with topology information
*
* Written by: Matthew Dobson, IBM Corporation
* Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
*
* Written by: Matthew Dobson, IBM Corporation
* Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
@@
-40,14
+40,18
@@
int arch_register_cpu(int num)
* restrictions and assumptions in kernel. This basically
* doesnt add a control file, one cannot attempt to offline
* BSP.
* restrictions and assumptions in kernel. This basically
* doesnt add a control file, one cannot attempt to offline
* BSP.
+ *
+ * Also certain PCI quirks require not to enable hotplug control
+ * for all CPU's.
*/
*/
- if (
!num
)
- cpu_devices[num].cpu.
no_control
= 1;
+ if (
num && enable_cpu_hotplug
)
+ cpu_devices[num].cpu.
hotpluggable
= 1;
return register_cpu(&cpu_devices[num].cpu, num);
}
#ifdef CONFIG_HOTPLUG_CPU
return register_cpu(&cpu_devices[num].cpu, num);
}
#ifdef CONFIG_HOTPLUG_CPU
+int enable_cpu_hotplug = 1;
void arch_unregister_cpu(int num) {
return unregister_cpu(&cpu_devices[num].cpu);
void arch_unregister_cpu(int num) {
return unregister_cpu(&cpu_devices[num].cpu);