summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2009-04-16 09:05:37 +0000
committerPaul Mackerras <paulus@samba.org>2009-04-28 13:53:29 +1000
commitd8f48457d5af6601abdecaad7a95c45bfeef90d5 (patch)
tree1d4a6c914fe6ec31cf6f7f655d09f47ededb33db
parentff61e5ccc35b7159a50741fc4b992817785acd5c (diff)
downloadlinux-3.10-d8f48457d5af6601abdecaad7a95c45bfeef90d5.tar.gz
linux-3.10-d8f48457d5af6601abdecaad7a95c45bfeef90d5.tar.bz2
linux-3.10-d8f48457d5af6601abdecaad7a95c45bfeef90d5.zip
powerpc/ps3: Fix build error on UP
A non-SMP version of smp_send_stop() is now included in smp.h. Remove the unneeded definition in the PS3 smp.c. Fixes build errors like these when CONFIG_SMP=n: arch/powerpc/platforms/ps3/setup.c:49: error: redefinition of 'smp_send_stop' include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/ps3/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 66181821322..1a7b5ae0c83 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -45,10 +45,6 @@
DEFINE_MUTEX(ps3_gpu_mutex);
EXPORT_SYMBOL_GPL(ps3_gpu_mutex);
-#if !defined(CONFIG_SMP)
-static void smp_send_stop(void) {}
-#endif
-
static union ps3_firmware_version ps3_firmware_version;
void ps3_get_firmware_version(union ps3_firmware_version *v)