Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

12 files changed, 15 insertions, 27 deletions

diff --git a/arch/mips64/Makefile b/arch/mips64/Makefile
index 9f02364f2..89a50ad4c 100644
--- a/arch/mips64/Makefile
+++ b/arch/mips64/Makefile
@@ -153,7 +153,6 @@ zdisk: vmlinux
 
 archclean:
 	@$(MAKEBOOT) clean
-	$(MAKE) -C arch/$(ARCH)/kernel clean
 	$(MAKE) -C arch/$(ARCH)/tools clean
 	rm -f vmlinux.64 arch/$(ARCH)/ld.script.elf32
 
diff --git a/arch/mips64/arc/Makefile b/arch/mips64/arc/Makefile
index eb805e260..be0f04984 100644
--- a/arch/mips64/arc/Makefile
+++ b/arch/mips64/arc/Makefile
@@ -12,6 +12,4 @@ endif
 
 obj-$(CONFIG_ARC_MEMORY) += memory.o
 
-L_OBJS	:= $(obj-y)
-
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/boot/Makefile b/arch/mips64/boot/Makefile
index 5362f7766..ef9aeb096 100644
--- a/arch/mips64/boot/Makefile
+++ b/arch/mips64/boot/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile,v 1.1 1999/08/18 21:46:52 ralf Exp $
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig
index 580ecb084..1636cb6cb 100644
--- a/arch/mips64/defconfig
+++ b/arch/mips64/defconfig
@@ -144,6 +144,7 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_CHR_DEV_SG is not set
 
@@ -424,6 +425,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_SGI_PARTITION=y
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
+# CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
 CONFIG_KCORE_ELF=y
 
diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22
index 8a747d636..d047a87c6 100644
--- a/arch/mips64/defconfig-ip22
+++ b/arch/mips64/defconfig-ip22
@@ -329,6 +329,7 @@ CONFIG_LOCKD=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_SGI_PARTITION=y
+# CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
 
 #
diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27
index 580ecb084..1636cb6cb 100644
--- a/arch/mips64/defconfig-ip27
+++ b/arch/mips64/defconfig-ip27
@@ -144,6 +144,7 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_CHR_DEV_SG is not set
 
@@ -424,6 +425,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_SGI_PARTITION=y
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
+# CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
 CONFIG_KCORE_ELF=y
 
diff --git a/arch/mips64/kernel/Makefile b/arch/mips64/kernel/Makefile
index e6ed31ca7..f97c9256a 100644
--- a/arch/mips64/kernel/Makefile
+++ b/arch/mips64/kernel/Makefile
@@ -12,27 +12,20 @@
 all:	kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
-O_OBJS	:= branch.o entry.o proc.o process.o ptrace.o r4k_cache.o r4k_fpu.o \
+
+export-objs = mips64_ksyms.o
+
+obj-y	:= branch.o entry.o proc.o process.o ptrace.o r4k_cache.o r4k_fpu.o \
 	   r4k_genex.o r4k_switch.o r4k_tlb.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 ioctl32.o
-endif
 
-ifdef CONFIG_BINFMT_ELF32
-O_OBJS += binfmt_elf32.o
-endif
-
-ifdef CONFIG_SMP
-O_OBJS += smp.o
-endif
+obj-$(CONFIG_MODULES)		+= mips64_ksyms.o
+obj-$(CONFIG_MIPS32_COMPAT)	+= linux32.o scall_o32.o signal32.o ioctl32.o
+obj-$(CONFIG_BINFMT_ELF32)	+= binfmt_elf32.o
+obj-$(CONFIG_SMP)		+= smp.o
 
 CFLAGS_r4k_genex.o := -P
 CFLAGS_r4k_tlb_glue.o := -P
 
-clean:
-
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c
index 077a63034..f30f6ba83 100644
--- a/arch/mips64/kernel/setup.c
+++ b/arch/mips64/kernel/setup.c
@@ -56,6 +56,8 @@ char wait_available;
  */
 char cyclecounter_available;
 
+unsigned long loops_per_sec;
+
 /*
  * Set if box has EISA slots.
  */
diff --git a/arch/mips64/lib/Makefile b/arch/mips64/lib/Makefile
index 9ce5f0bd7..69945b97b 100644
--- a/arch/mips64/lib/Makefile
+++ b/arch/mips64/lib/Makefile
@@ -14,6 +14,4 @@ obj-y	+= csum_partial.o csum_partial_copy.o dump_tlb.o floppy-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 2505f05bd..3b5cea2a6 100644
--- a/arch/mips64/mm/Makefile
+++ b/arch/mips64/mm/Makefile
@@ -13,6 +13,4 @@ obj-$(CONFIG_CPU_NEVADA)	+= r4xx0.o
 obj-$(CONFIG_CPU_R10000)	+= andes.o
 obj-$(CONFIG_SGI_IP22)		+= umap.o
 
-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 641fcbddf..d48799929 100644
--- a/arch/mips64/sgi-ip22/Makefile
+++ b/arch/mips64/sgi-ip22/Makefile
@@ -13,6 +13,4 @@ L_TARGET = ip22.a
 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 49dd85cb4..efe257735 100644
--- a/arch/mips64/sgi-ip27/Makefile
+++ b/arch/mips64/sgi-ip27/Makefile
@@ -13,6 +13,4 @@ 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