Merge with Linux 2.4.0-test12.

10 files changed, 29 insertions, 56 deletions

diff --git a/arch/mips64/arc/Makefile b/arch/mips64/arc/Makefile
index 141093f78..eb805e260 100644
--- a/arch/mips64/arc/Makefile
+++ b/arch/mips64/arc/Makefile
@@ -3,15 +3,15 @@
 #
 
 L_TARGET = arclib.a
-L_OBJS  = init.o printf.o tree.o env.o cmdline.o misc.o time.o \
-	  file.o identify.o
+obj-y	:= init.o printf.o tree.o env.o cmdline.o misc.o time.o file.o \
+	   identify.o
 
 ifndef CONFIG_SGI_IP27
-L_OBJS += console.o
+  obj-y += console.o
 endif
 
-ifdef CONFIG_ARC_MEMORY
-L_OBJS += memory.o
-endif
+obj-$(CONFIG_ARC_MEMORY) += memory.o
+
+L_OBJS	:= $(obj-y)
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index 72f0b52bc..580ecb084 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -405,8 +405,6 @@ CONFIG_LOCKD_V4=y
 # CONFIG_NCPFS_NFS_NS is not set
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
 
diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22
index 3848c0c96..8a747d636 100644
--- a/arch/mips64/defconfig-ip22
+++ b/arch/mips64/defconfig-ip22
@@ -321,8 +321,6 @@ CONFIG_LOCKD=y
 # CONFIG_NCPFS_NFS_NS is not set
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
 
diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27
index 72f0b52bc..580ecb084 100644
--- a/arch/mips64/defconfig-ip27
+++ b/arch/mips64/defconfig-ip27
@@ -405,8 +405,6 @@ CONFIG_LOCKD_V4=y
 # CONFIG_NCPFS_NFS_NS is not set
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
 
diff --git a/arch/mips64/kernel/traps.c b/arch/mips64/kernel/traps.c
index 997aee0c7..c6777f938 100644
--- a/arch/mips64/kernel/traps.c
+++ b/arch/mips64/kernel/traps.c
@@ -27,19 +27,6 @@
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 
-extern int console_loglevel;
-
-static inline void console_silent(void)
-{
-	console_loglevel = 0;
-}
-
-static inline void console_verbose(void)
-{
-	if (console_loglevel)
-		console_loglevel = 15;
-}
-
 extern asmlinkage void __xtlb_mod(void);
 extern asmlinkage void __xtlb_tlbl(void);
 extern asmlinkage void __xtlb_tlbs(void);
diff --git a/arch/mips64/lib/Makefile b/arch/mips64/lib/Makefile
index b8392d527..9ce5f0bd7 100644
--- a/arch/mips64/lib/Makefile
+++ b/arch/mips64/lib/Makefile
@@ -8,9 +8,12 @@
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
 L_TARGET = lib.a
-L_OBJS	= csum_partial.o csum_partial_copy.o dump_tlb.o floppy-std.o \
+
+obj-y	+= csum_partial.o csum_partial_copy.o dump_tlb.o floppy-std.o \
 	  floppy-no.o ide-std.o ide-no.o kbd-std.o kbd-no.o rtc-std.o \
 	  rtc-no.o memset.o memcpy.o strlen_user.o strncpy_user.o \
 	  strnlen_user.o watch.o
 
+L_OBJS	:= $(obj-y)
+
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/mm/Makefile b/arch/mips64/mm/Makefile
index fe95aff18..2505f05bd 100644
--- a/arch/mips64/mm/Makefile
+++ b/arch/mips64/mm/Makefile
@@ -1,33 +1,18 @@
-# $Id: Makefile,v 1.4 2000/01/17 23:32:46 ralf Exp $
 #
 # Makefile for the Linux/MIPS-specific parts of the memory manager.
 #
 
 O_TARGET := mm.o
-O_OBJS	 := extable.o init.o fault.o loadmmu.o
 
-ifdef CONFIG_CPU_R4300
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_R4X00
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_R5000
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_NEVADA
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_R10000
-O_OBJS	+= andes.o
-endif
+obj-y	 := extable.o init.o fault.o loadmmu.o
 
-ifdef CONFIG_SGI_IP22
-O_OBJS   += umap.o
-endif
+obj-$(CONFIG_CPU_R4300)		+= r4xx0.o
+obj-$(CONFIG_CPU_R4X00)		+= r4xx0.o
+obj-$(CONFIG_CPU_R5000)		+= r4xx0.o
+obj-$(CONFIG_CPU_NEVADA)	+= r4xx0.o
+obj-$(CONFIG_CPU_R10000)	+= andes.o
+obj-$(CONFIG_SGI_IP22)		+= umap.o
 
-ifdef CONFIG_BAGET_MIPS
-O_OBJS   += umap.o
-endif
+O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/sgi-ip22/Makefile b/arch/mips64/sgi-ip22/Makefile
index f303d90da..641fcbddf 100644
--- a/arch/mips64/sgi-ip22/Makefile
+++ b/arch/mips64/sgi-ip22/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile,v 1.1 1999/08/20 21:13:33 ralf Exp $
 #
 # Makefile for the SGI specific kernel interface routines
 # under Linux.
@@ -10,7 +9,10 @@
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
 L_TARGET = ip22.a
-L_OBJS  = ip22-berr.o ip22-mc.o ip22-sc.o ip22-hpc.o ip22-int.o ip22-rtc.o \
-        ip22-setup.o system.o ip22-timer.o ip22-irq.o ip22-reset.o time.o
+
+obj-y	+= ip22-berr.o ip22-mc.o ip22-sc.o ip22-hpc.o ip22-int.o ip22-rtc.o \
+	   ip22-setup.o system.o ip22-timer.o ip22-irq.o ip22-reset.o time.o
+
+L_OBJS	:= $(obj-y)
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/sgi-ip27/Makefile b/arch/mips64/sgi-ip27/Makefile
index cab7e6be5..49dd85cb4 100644
--- a/arch/mips64/sgi-ip27/Makefile
+++ b/arch/mips64/sgi-ip27/Makefile
@@ -8,8 +8,11 @@
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
 O_TARGET = ip27.a
-O_OBJS  = ip27-berr.o ip27-console.o ip27-irq.o ip27-init.o ip27-irq-glue.o \
-	  ip27-klconfig.o ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-pci.o \
-	  ip27-pci-dma.o ip27-reset.o ip27-setup.o ip27-timer.o
+
+obj-y	:= ip27-berr.o ip27-console.o ip27-irq.o ip27-init.o ip27-irq-glue.o \
+	   ip27-klconfig.o ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-pci.o \
+	   ip27-pci-dma.o ip27-reset.o ip27-setup.o ip27-timer.o
+
+O_OBJS	:= $(obj-y)
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/tools/Makefile b/arch/mips64/tools/Makefile
index 3218bfe5f..33d0c17b1 100644
--- a/arch/mips64/tools/Makefile
+++ b/arch/mips64/tools/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile,v 1.1 1999/08/18 21:46:53 ralf Exp $
 #
 # Makefile for MIPS kernel build tools.
 #