diff options
-rw-r--r-- | arch/powerpc/xmon/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 6 | ||||
-rw-r--r-- | include/asm-powerpc/elf.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile index 69303575d3d6..51d97588e762 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 | |||
8 | 8 | ||
9 | ifdef CONFIG_XMON_DISASSEMBLY | 9 | ifdef CONFIG_XMON_DISASSEMBLY |
10 | obj-y += ppc-dis.o ppc-opc.o | 10 | obj-y += ppc-dis.o ppc-opc.o |
11 | obj-$(CONFIG_PPC_CELL) += spu-dis.o spu-opc.o | 11 | obj-$(CONFIG_SPU_BASE) += spu-dis.o spu-opc.o |
12 | endif | 12 | endif |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1cf90c8ac34a..dc8a3760a98c 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -213,7 +213,7 @@ Commands:\n\ | |||
213 | p call a procedure\n\ | 213 | p call a procedure\n\ |
214 | r print registers\n\ | 214 | r print registers\n\ |
215 | s single step\n" | 215 | s single step\n" |
216 | #ifdef CONFIG_PPC_CELL | 216 | #ifdef CONFIG_SPU_BASE |
217 | " ss stop execution on all spus\n\ | 217 | " ss stop execution on all spus\n\ |
218 | sr restore execution on stopped spus\n\ | 218 | sr restore execution on stopped spus\n\ |
219 | sf # dump spu fields for spu # (in hex)\n\ | 219 | sf # dump spu fields for spu # (in hex)\n\ |
@@ -2654,7 +2654,7 @@ void __init xmon_setup(void) | |||
2654 | debugger(NULL); | 2654 | debugger(NULL); |
2655 | } | 2655 | } |
2656 | 2656 | ||
2657 | #ifdef CONFIG_PPC_CELL | 2657 | #ifdef CONFIG_SPU_BASE |
2658 | 2658 | ||
2659 | struct spu_info { | 2659 | struct spu_info { |
2660 | struct spu *spu; | 2660 | struct spu *spu; |
@@ -2907,7 +2907,7 @@ static int do_spu_cmd(void) | |||
2907 | 2907 | ||
2908 | return 0; | 2908 | return 0; |
2909 | } | 2909 | } |
2910 | #else /* ! CONFIG_PPC_CELL */ | 2910 | #else /* ! CONFIG_SPU_BASE */ |
2911 | static int do_spu_cmd(void) | 2911 | static int do_spu_cmd(void) |
2912 | { | 2912 | { |
2913 | return -1; | 2913 | return -1; |
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h index 4545aa682509..b5436642a109 100644 --- a/include/asm-powerpc/elf.h +++ b/include/asm-powerpc/elf.h | |||
@@ -411,7 +411,7 @@ do { \ | |||
411 | /* Keep this the last entry. */ | 411 | /* Keep this the last entry. */ |
412 | #define R_PPC64_NUM 107 | 412 | #define R_PPC64_NUM 107 |
413 | 413 | ||
414 | #ifdef CONFIG_PPC_CELL | 414 | #ifdef CONFIG_SPU_BASE |
415 | /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */ | 415 | /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */ |
416 | #define NT_SPU 1 | 416 | #define NT_SPU 1 |
417 | 417 | ||