summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-05-10 14:17:18 +0200
committerPaul Mackerras <paulus@samba.org>2007-05-10 14:17:18 +0200
commitf64071200acc124bd0d641ef7d750f38fbf5f8b8 (patch)
treeed06fb0358a2f271aeca125211e8fefaea335c50
parent[POWERPC] Split initrd logic out of early_init_dt_scan_chosen() to fix warning (diff)
downloadlinux-f64071200acc124bd0d641ef7d750f38fbf5f8b8.tar.xz
linux-f64071200acc124bd0d641ef7d750f38fbf5f8b8.zip
[POWERPC] Fix compile error with kexec and CONFIG_SMP=n
Commit 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f moved the definition of hard_smp_processor_id() for the UP case from include/linux/smp.h to include/asm/smp.h. However, include/linux/smp.h only includes include/asm/smp.h in the SMP case, so code that wants to use hard_smp_processor_id() has to include <asm/smp.h> explicitly to be sure of getting the definition. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/pseries/kexec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index af2685607458..412a5e7aff2d 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -12,6 +12,7 @@
#include <asm/firmware.h>
#include <asm/kexec.h>
#include <asm/mpic.h>
+#include <asm/smp.h>
#include "pseries.h"
#include "xics.h"