- IOC3 driver now will panic when encountering a RX/TX PCI DMA error.

 - IOC3 driver does no longer use GFP_DMA which given the _very_ small
   number of available GFP_DMA pages might have deadlocked the system.
 - First cut of Origin support.  Last minute change:  Do no longer use
   ARC memory / MD hub memory configuration information but klconfig.h
   stuff.  Simpler, faster, shorter.
 - Zillions of MIPS64 fixes.

1 files changed, 11 insertions, 4 deletions

diff --git a/arch/mips64/kernel/Makefile b/arch/mips64/kernel/Makefile
index 9856524c3..0f70cba13 100644
--- a/arch/mips64/kernel/Makefile
+++ b/arch/mips64/kernel/Makefile
@@ -12,12 +12,19 @@
 all:	kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
-O_OBJS	:= binfmt_elf32.o branch.o entry.o proc.o process.o ptrace.o \
-	   r4k_cache.o r4k_fpu.o r4k_genex.o r4k_switch.o r4k_tlb_debug.o \
-	   r4k_tlb_glue.o scall_64.o scall_o32.o semaphore.o setup.o signal.o \
-	   softfp.o syscall.o traps.o unaligned.o
+O_OBJS	:= branch.o entry.o proc.o process.o ptrace.o r4k_cache.o r4k_fpu.o \
+	   r4k_genex.o r4k_switch.o r4k_tlb_debug.o r4k_tlb_glue.o scall_64.o \
+	   semaphore.o setup.o signal.o softfp.o syscall.o traps.o unaligned.o
 OX_OBJS := mips64_ksyms.o
 
+ifdef CONFIG_MIPS32_COMPAT
+O_OBJS += linux32.o scall_o32.o signal32.o
+endif
+
+ifdef CONFIG_BINFMT_ELF32
+O_OBJS += binfmt_elf32.o
+endif
+
 clean:
 
 include $(TOPDIR)/Rules.make