My proposal for non-generic kernels:

o only code for the configured CPU is compiled
  and linked (saves ~100k for R3000 kernels!)
o removed a lot of indirect function calls
o removed Ralf's "cowboy patch"
o added sanity check for DECstations (print warning
  if the kernel is configured for the wrong CPU)

1 files changed, 12 insertions, 2 deletions

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 66306b16b..a1e6a6d29 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -14,10 +14,20 @@ EXTRA_ASFLAGS = -mips3 -mcpu=r4000
 O_TARGET := kernel.o
 O_OBJS	:= branch.o process.o signal.o entry.o traps.o ptrace.o vm86.o \
 	   ioport.o pci.o reset.o setup.o syscall.o sysmips.o ipc.o \
-	   r4k_switch.o r4k_misc.o r4k_fpu.o r2300_switch.o r2300_misc.o \
-	   r2300_fpu.o r6000_fpu.o scall_o32.o softfp.o unaligned.o
+	   scall_o32.o softfp.o unaligned.o
 OX_OBJS := mips_ksyms.o
 
+ifdef CONFIG_CPU_R3000
+O_OBJS	+= r2300_misc.o r2300_fpu.o r2300_switch.o
+else
+O_OBJS	+= r4k_misc.o r4k_switch.o 
+ifdef CONFIG_CPU_R6000
+O_OBJS	+= r6000_fpu.o
+else
+O_OBJS	+= r4k_fpu.o
+endif
+endif
+
 ifdef CONFIG_MIPS_FPE_MODULE
 M_OBJS += fpe.o
 endif