From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 27 Nov 2006 18:18:55 +0000 (+0100)
Subject: [POWERPC] cell: fix building without spufs
X-Git-Tag: v2.6.20-rc1~34^2~40^2~8^2~40
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e055595d3e5f5233374211bc6893e5d16976df99;p=linux-2.6

[POWERPC] cell: fix building without spufs

It may be desireable to build a kernel for cell without
spufs, e.g. as the initial kboot kernel. This requires
that the SPU specific parts of the core dump and the xmon
code depend on CONFIG_SPU_BASE instead of CONFIG_PPC_CELL.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
---

diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index 69303575d3..51d97588e7 100644
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -8,5 +8,5 @@ obj-y			+= xmon.o setjmp.o start.o nonstdio.o
 
 ifdef CONFIG_XMON_DISASSEMBLY
 obj-y			+= ppc-dis.o ppc-opc.o
-obj-$(CONFIG_PPC_CELL)	+= spu-dis.o spu-opc.o
+obj-$(CONFIG_SPU_BASE)	+= spu-dis.o spu-opc.o
 endif
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 1cf90c8ac3..dc8a3760a9 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -213,7 +213,7 @@ Commands:\n\
   p 	call a procedure\n\
   r	print registers\n\
   s	single step\n"
-#ifdef CONFIG_PPC_CELL
+#ifdef CONFIG_SPU_BASE
 "  ss	stop execution on all spus\n\
   sr	restore execution on stopped spus\n\
   sf  #	dump spu fields for spu # (in hex)\n\
@@ -2654,7 +2654,7 @@ void __init xmon_setup(void)
 		debugger(NULL);
 }
 
-#ifdef CONFIG_PPC_CELL
+#ifdef CONFIG_SPU_BASE
 
 struct spu_info {
 	struct spu *spu;
@@ -2907,7 +2907,7 @@ static int do_spu_cmd(void)
 
 	return 0;
 }
-#else /* ! CONFIG_PPC_CELL */
+#else /* ! CONFIG_SPU_BASE */
 static int do_spu_cmd(void)
 {
 	return -1;
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h
index 4545aa6825..b5436642a1 100644
--- a/include/asm-powerpc/elf.h
+++ b/include/asm-powerpc/elf.h
@@ -411,7 +411,7 @@ do {									\
 /* Keep this the last entry.  */
 #define R_PPC64_NUM		107
 
-#ifdef CONFIG_PPC_CELL
+#ifdef CONFIG_SPU_BASE
 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
 #define NT_SPU		1