Skip to content

Commit a4aec0f

Browse files
pcercueitsbogend
authored andcommitted
MIPS: Remove legacy MIPS_MACHINE option
The CONFIG_MIPS_MACHINE option is dead code that hasn't been used in years. The Kconfig option is not selected anywhere, and the <asm/mips_machine.h> is not included anywhere either. To make things worse, for years it co-existed with a separate MIPS machine implementation as <asm/machine.h>. The two defined the 'mips_machine' structure with different fields, and the 'MIPS_MACHINE' macro with different parameters. The two used the same memory area (defined by the linker script) to store data, and you could totally use the two at the same time for all kinds of funny results. Signed-off-by: Paul Cercueil <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 64aa9fd commit a4aec0f

File tree

4 files changed

+0
-112
lines changed

4 files changed

+0
-112
lines changed

arch/mips/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,9 +1150,6 @@ config MIPS_MSC
11501150
config SYNC_R4K
11511151
bool
11521152

1153-
config MIPS_MACHINE
1154-
def_bool n
1155-
11561153
config NO_IOPORT_MAP
11571154
def_bool n
11581155

arch/mips/include/asm/mips_machine.h

Lines changed: 0 additions & 46 deletions
This file was deleted.

arch/mips/kernel/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
9393
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
9494
obj-$(CONFIG_EARLY_PRINTK_8250) += early_printk_8250.o
9595
obj-$(CONFIG_SPINLOCK_TEST) += spinlock_test.o
96-
obj-$(CONFIG_MIPS_MACHINE) += mips_machine.o
9796
obj-$(CONFIG_MIPSR2_TO_R6_EMULATOR) += mips-r2-to-r6-emul.o
9897

9998
CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -x c /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)

arch/mips/kernel/mips_machine.c

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)