Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: PowerTV: Fix build.

CC arch/mips/powertv/init.o
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_nmi_setup’:
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:80:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable]
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_ejtag_setup’:
/home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:94:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors

As these two functions are, they don't serve any useful purpose so I've
deleted them entirely.

This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use
-Wunused-but-set-variable to suppress it.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

-37
-37
arch/mips/powertv/init.c
··· 69 69 return result; 70 70 } 71 71 72 - /* TODO: Verify on linux-mips mailing list that the following two */ 73 - /* functions are correct */ 74 - /* TODO: Copy NMI and EJTAG exception vectors to memory from the */ 75 - /* BootROM exception vectors. Flush their cache entries. test it. */ 76 - 77 - static void __init mips_nmi_setup(void) 78 - { 79 - void *base; 80 - #if defined(CONFIG_CPU_MIPS32_R1) 81 - base = cpu_has_veic ? 82 - (void *)(CAC_BASE + 0xa80) : 83 - (void *)(CAC_BASE + 0x380); 84 - #elif defined(CONFIG_CPU_MIPS32_R2) 85 - base = (void *)0xbfc00000; 86 - #else 87 - #error NMI exception handler address not defined 88 - #endif 89 - } 90 - 91 - static void __init mips_ejtag_setup(void) 92 - { 93 - void *base; 94 - 95 - #if defined(CONFIG_CPU_MIPS32_R1) 96 - base = cpu_has_veic ? 97 - (void *)(CAC_BASE + 0xa00) : 98 - (void *)(CAC_BASE + 0x300); 99 - #elif defined(CONFIG_CPU_MIPS32_R2) 100 - base = (void *)0xbfc00480; 101 - #else 102 - #error EJTAG exception handler address not defined 103 - #endif 104 - } 105 - 106 72 void __init prom_init(void) 107 73 { 108 74 int prom_argc; ··· 78 112 prom_argv = (char *) fw_arg1; 79 113 _prom_envp = (int *) fw_arg2; 80 114 _prom_memsize = (unsigned long) fw_arg3; 81 - 82 - board_nmi_handler_setup = mips_nmi_setup; 83 - board_ejtag_handler_setup = mips_ejtag_setup; 84 115 85 116 if (prom_argc == 1) { 86 117 strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);