diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 03:45:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-16 07:04:49 -0400 |
| commit | b14f5c100ce4c63e4c5a71ab47e71cf4a1caa9e3 (patch) | |
| tree | 5c13bf03d4ce199bebffb66146daf5d9fd731bfd /include/asm-sparc64 | |
| parent | f8be339c02c1e543eee8e09ffe600c0e61be5898 (diff) | |
[SPARC64]: Fix build regressions added by dr-cpu changes.
Do not select HOTPLUG_CPU from SUN_LDOMS, that causes
HOTPLUG_CPU to be selected even on non-SMP which is
illegal.
Only build hvtramp.o when SMP, just like trampoline.o
Protect dr-cpu code in ds.c with HOTPLUG_CPU.
Likewise move ldom_startcpu_cpuid() to smp.c and protect
it and the call site with SUN_LDOMS && HOTPLUG_CPU.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/ldc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/ldc.h b/include/asm-sparc64/ldc.h index 8d17bd6bd5db..bdb524a7b814 100644 --- a/include/asm-sparc64/ldc.h +++ b/include/asm-sparc64/ldc.h | |||
| @@ -7,7 +7,6 @@ extern int ldom_domaining_enabled; | |||
| 7 | extern void ldom_set_var(const char *var, const char *value); | 7 | extern void ldom_set_var(const char *var, const char *value); |
| 8 | extern void ldom_reboot(const char *boot_command); | 8 | extern void ldom_reboot(const char *boot_command); |
| 9 | extern void ldom_power_off(void); | 9 | extern void ldom_power_off(void); |
| 10 | extern void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg); | ||
| 11 | 10 | ||
| 12 | /* The event handler will be evoked when link state changes | 11 | /* The event handler will be evoked when link state changes |
| 13 | * or data becomes available on the receive side. | 12 | * or data becomes available on the receive side. |