linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree

[LV-k25-commit] CVS: kernel-2.5/Documentation/filesystems driverfs.txt,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/Documentation/filesystems
In directory sc8-pr-cvs1:/tmp/cvs-serv16435/Documentation/filesystems

Removed Files:
	driverfs.txt 
Log Message:
Merge with 2.5.45


--- driverfs.txt DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/vax/lib lshrdi3.c,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv6008/arch/vax/lib

Modified Files:
	lshrdi3.c 
Log Message:
Forward-port Dave's fix from 2.4


Index: lshrdi3.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/lshrdi3.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lshrdi3.c	20 May 2002 00:33:33 -0000	1.3
+++ lshrdi3.c	11 May 2003 19:51:40 -0000	1.4
@@ -25,7 +25,7 @@
 typedef		 int DItype	__attribute__ ((mode (DI)));
 typedef int word_type __attribute__ ((mode (__word__)));
 
-struct DIstruct {SItype high, low;};
+struct DIstruct {SItype low, high;};
 
 typedef union
 {

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax div64.h,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv5886/include/asm

Modified Files:
	div64.h 
Log Message:
Forward-port Dave's fix to do_div() in 2.4


Index: div64.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/div64.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- div64.h	20 May 2002 00:33:39 -0000	1.3
+++ div64.h	11 May 2003 19:51:17 -0000	1.4
@@ -1,13 +1,38 @@
-#ifndef __VAX_DIV64
-#define __VAX_DIV64
+#ifndef __ASM_VAX_DIV64
+#define __ASM_VAX_DIV64
 
-/* atp jan 2001. Take from asm-s390. 
- * FIXME: replace by quadword divide */
+/*
+ * DA: stolen from parisc port - probably can be optimized a lot beter 
+ */
+
+/*
+ * unsigned long long division.  Yuck Yuck!  What is Linux coming to?
+ * This is 100% disgusting
+ */
+#define do_div(n,base)							\
+({									\
+	unsigned long __low, __low2, __high, __rem;			\
+	__low  = (n) & 0xffffffff;					\
+	__high = (n) >> 32;						\
+	if (__high) {							\
+		__rem   = __high % (unsigned long)base;			\
+		__high  = __high / (unsigned long)base;			\
+		__low2  = __low >> 16;					\
+		__low2 += __rem << 16;					\
+		__rem   = __low2 % (unsigned long)base;			\
+		__low2  = __low2 / (unsigned long)base;			\
+		__low   = __low & 0xffff;				\
+		__low  += __rem << 16;					\
+		__rem   = __low  % (unsigned long)base;			\
+		__low   = __low  / (unsigned long)base;			\
+		n = __low  + ((long long)__low2 << 16) +		\
+			((long long) __high << 32);			\
+	} else {							\
+		__rem = __low % (unsigned long)base;			\
+		n = (__low / (unsigned long)base);			\
+	}								\
+	__rem;								\
+})
+#endif
 
-#define do_div(n,base) ({ \
-int __res; \
-__res = ((unsigned long) n) % (unsigned) base; \
-n = ((unsigned long) n) / (unsigned) base; \
-__res; })
 
-#endif  /* __ASM_VAX_DIV64_H */

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax system.h,1.11,1.12

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv18011/include/asm-vax

Modified Files:
	system.h 
Log Message:
2.5.45 includes a check in the slab allocator's reclamation timer
softirq that "IRQs" are actually enabled.  Our previous scheme of
ignoring local_irq_enable when on the interrupt stack broke this
test, causing a crash.

Now, we will drop IPL to 1 if someone calls local_irq_enable while
on the interrupt stack.  But this would cause REI to crash as it 
would result in a return to a higher IPL.  So we simply raise IPL
to 31 before REI-ing.

It's not a very VAX-like thing to do, but it fits the way linux
emulates "soft" interrupts on CPUs that don't support them in 
hardware.  An alternative on VAX would be to rewire the dispatching
of softirqs so that they get called from an IPL 8 interrupt (or
similar).


Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- system.h	17 Apr 2003 02:17:36 -0000	1.11
+++ system.h	11 May 2003 17:43:36 -0000	1.12
@@ -108,22 +108,12 @@
 
    So, instead, we drop IPL to 1 if we're running on the interrupt
    stack, thus making sure that REI will be kept happy. */
-/* since 2.4.6, there is now a local_irq_enable in 
- * the softirq/tasklet code - which is fine, except when we are 
- * interrupted servicing a device interrupt with IPL=0x14 (say).
- * in this case, if we set IPL to 1, we return to the higher IPL
- * and everything dies horribly.  So, we check for is=set, prevmode=K
- * and leave the ipl alone if so.
- */
 
 extern __inline__ void
 local_irq_enable(void)
 {
 	if (__psl.is) {
-	   if (__psl.prevmode != PSL_MODE_KERNEL) {
 		setipl(1);
-	   }
-	   /* else do nothing */
 	} else {
 		setipl(0);
 	}

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel entry.S,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv18011/arch/vax/kernel

Modified Files:
	entry.S 
Log Message:
2.5.45 includes a check in the slab allocator's reclamation timer
softirq that "IRQs" are actually enabled.  Our previous scheme of
ignoring local_irq_enable when on the interrupt stack broke this
test, causing a crash.

Now, we will drop IPL to 1 if someone calls local_irq_enable while
on the interrupt stack.  But this would cause REI to crash as it 
would result in a return to a higher IPL.  So we simply raise IPL
to 31 before REI-ing.

It's not a very VAX-like thing to do, but it fits the way linux
emulates "soft" interrupts on CPUs that don't support them in 
hardware.  An alternative on VAX would be to rewire the dispatching
of softirqs so that they get called from an IPL 8 interrupt (or
similar).


Index: entry.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/entry.S,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- entry.S	10 Feb 2003 00:54:49 -0000	1.7
+++ entry.S	11 May 2003 17:43:36 -0000	1.8
@@ -190,6 +190,7 @@
 	/* Restore R0 and dismiss exception */
 
 	movl (sp)+, r0
+	mtpr $31, $PR_IPL
 	rei
 
 /* irqvec_stray is the generic handler for all exceptions and interrupts

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax poll.h,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv17709/include/asm-vax

Modified Files:
	poll.h 
Log Message:
2.5.45 needs a definition for POLLREMOVE


Index: poll.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/poll.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poll.h	20 May 2002 00:33:39 -0000	1.3
+++ poll.h	11 May 2003 17:38:38 -0000	1.4
@@ -14,6 +14,7 @@
 #define POLLWRNORM	256
 #define POLLWRBAND	512
 #define POLLMSG		1024
+#define POLLREMOVE	2048
 
 struct pollfd {
 	int fd;

[LV-k25-commit] CVS: kernel-2.5/scripts Makefile.build,1.1.1.1,1.2

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv17374

Modified Files:
	Makefile.build 
Log Message:
Generate compiler listing files


Index: Makefile.build
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.build	18 Apr 2003 23:36:49 -0000	1.1.1.1
+++ Makefile.build	11 May 2003 17:37:38 -0000	1.2
@@ -80,8 +80,11 @@
 %.i: %.c FORCE
 	$(call if_changed_dep,cc_i_c)
 
+# define listing_o_c to get compiler listings from .c -> .o compilations
+listing_o_c = -Wa,-adnhls=$(subst $(comma),_,$(@D)/$(*F)).lst -g
+
 quiet_cmd_cc_o_c = CC      $@
-cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $<
+cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $< $(listing_o_c)
 
 %.o: %.c FORCE
 	$(call if_changed_dep,cc_o_c)

[LV-k25-commit] CVS: kernel-2.5/arch/vax/boot/tools Makefile,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv16731/boot/tools

Modified Files:
	Makefile 
Log Message:
Need to specify EXTRA_TARGETS to get tools built


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/tools/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	24 Mar 2003 20:12:25 -0000	1.2
+++ Makefile	11 May 2003 17:35:58 -0000	1.3
@@ -1,4 +1,6 @@
 
+EXTRA_TARGETS := mkbootblk setcmdline showcmdline
+
 host-progs := mkbootblk setcmdline
 
 $(obj)/showcmdline: $(obj)/setcmdline

[LV-k25-commit] CVS: kernel-2.5/arch/vax Makefile,1.18,1.19

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv16497

Modified Files:
	Makefile 
Log Message:
New way of descending into subdirs in 2.5.45


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile	24 Mar 2003 20:12:22 -0000	1.18
+++ Makefile	11 May 2003 17:35:15 -0000	1.19
@@ -49,7 +49,7 @@
 
 .PHONY: TOOLS
 TOOLS:
-	@$(call descend,arch/$(ARCH)/boot/tools,$(1))
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(TOOLSDIR)
 
 # This will make a disk-bootable image.  dd this directly to a
 # disk and then tell your VAX to boot from this disk

[LV-k25-commit] CVS: kernel-2.5/arch/vax Kconfig,NONE,1.1

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv16088

Added Files:
	Kconfig 
Log Message:
New-style config file for VAX


--- NEW FILE ---
#
# For a description of the syntax of this configuration file,
# see Documentation/kbuild/config-language.txt.
#

mainmenu "Linux Kernel Configuration"

config VAX
	bool
	default y
	help
	  Select this option, if you want to run the kernel on 
	  one of Digital's VAX line of computers.  You will need
	  a VAX compiler (see http://www.linux-vax.org).

config UID16
	bool
	default y

config RWSEM_GENERIC_SPINLOCK
	bool
	default y

config RWSEM_XCHGADD_ALGORITHM
	bool
	default n

menu "General setup"
 
config BINFMT_ELF
	bool
	default y

config ELF_KERNEL
	bool
	default y

config KCORE_ELF
	bool
	default y

config PREEMPT
	bool "Preemptible kernel (currently broken)"
	default n

config NET
	bool "Networking support"
	default y

config SYSVIPC
	bool "System V IPC"
	default y

config BSD_PROCESS_ACCT
	bool "BSD Process Accounting"
	default y

config SYSCTL
	bool "Sysctl support"
	default y


endmenu

menu "Bus support"

config QBUS
	bool "Support for Q-bus"
	default n

config VSBUS
	bool "Support for VAXstation bus"
	default n

config VAX_4000HC
	bool "Hardcode 4000/60 (temporary for now - DA)"
	depends VSBUS
	default n

endmenu

source "drivers/block/Kconfig"

if NET
source "net/Kconfig"
endif


menu "SCSI support"

config SCSI
	bool "SCSI support"
	default n

if SCSI

comment "SCSI support type (disk, tape, CDROM)"

config BLK_DEV_SD
	bool "SCSI disk support"
	default y

config CHR_DEV_ST
	bool "SCSI tape support"
	default y

config BLK_DEV_SR
	bool "SCSI CDROM support"
	default y

config CHR_DEV_SG
	bool "SCSI generic device support"
	default y

comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"

config SCSI_MULTI_LUN
	bool "Probe all LUNs on each SCSI device"
	default n

config SCSI_CONSTANTS
	bool "Verbose SCSI error reporting"
	default y

comment "SCSI low-level drivers"

config SCSI_VAX_5380
	bool "NCR53C80 Scsi Driver (used in VAXstation/MicroVAX 3100 family)"
	default n

config SCSI_VAX_53C94
	bool "NCR53C94 Scsi Driver (used in VAXstation 4000 family) (NOT WORKING)"
	default n

endif

endmenu

if NET
menu "Network device support"

config NETDEVICES
	bool "Network device support"

if NETDEVICES
config DUMMY
	bool "Dummy net driver support"
	default n

config SLIP
	bool "SLIP (serial line) support"
	default n

config SLIP_COMPRESSED
	bool " CSLIP compressed headers"
	depends SLIP
	default y

config SLIP_SMART
	bool " Keepalive and linefill"
	depends SLIP
	default n

config PPP
	bool "PPP (point-to-point) support"
	default n

comment "CCP compressors for PPP are only built as modules."
	depends PPP

config VAX_LANCE
	bool "LANCE ethernet controller support"
	default n

config VAX_SGEC
	bool "SGEC ethernet controller support (EXPERIMENTAL)"
	default n

config DELQA
	bool "DELQA/DEQNA Q-bus ethernet controller support"
	depends QBUS
	default n

endif

endmenu
endif

source "fs/Kconfig"

menu "VAX character devices"

config SERIAL
	bool "Serial port support"
	default y

if SERIAL

config DZ
	bool "DZ11 Serial Support"
	default n

config SERIAL_IPR
	bool "CPU register-based Serial Console Support"
	default y

config SERIAL_CONSOLE
	bool "Support for console on serial port"
	default y

endif

config UNIX98_PTYS
	bool "Unix98 PTY support"
	default y

config UNIX98_PTY_COUNT
	int "Maximum number of Unix98 PTYs in use (0-2048)"
	depends UNIX98_PTYS
	default 256
	
config RTC
	bool "Enhanced Real Time Clock Support"

endmenu


menu "Kernel hacking"

config DEBUG_KERNEL
	bool "Kernel debugging"
	default y

if DEBUG_KERNEL
config DEBUG_SLAB
	bool "SLAB allocator debugging"
	default y

config DEBUG_SPINLOCK
	bool "Spinlock debugging"
	default y

config DEBUG_BUGVERBOSE
	bool "Verbose BUG reporting"
	default y
endif

endmenu

source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.52,1.53

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv13237

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.45


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Makefile	17 Apr 2003 02:01:44 -0000	1.52
+++ Makefile	21 Apr 2003 23:10:27 -0000	1.53
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 44
+SUBLEVEL = 45
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -38,13 +38,17 @@
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 
+UTS_MACHINE := $(ARCH)
+
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
 	  else echo sh; fi ; fi)
 TOPDIR	:= $(CURDIR)
 
 HOSTCC  	= gcc
+HOSTCXX  	= g++
 HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCXXFLAGS	= -O2
 
 CROSS_COMPILE 	= vax-dec-linux-
 
@@ -106,11 +110,20 @@
 
 MAKEFLAGS += --no-print-directory
 
+# For maximum performance (+ possibly random breakage, uncomment
+# the following)
+
+#MAKEFLAGS += -rR
+
 #	If the user wants quiet mode, echo short versions of the commands 
 #	only
 
-ifneq ($(KBUILD_VERBOSE),1)
+ifeq ($(KBUILD_VERBOSE),1)
+  quiet =
+  Q =
+else
   quiet=quiet_
+  Q = @
 endif
 
 #	If the user is running make -s (silent mode), suppress echoing of
@@ -120,7 +133,7 @@
   quiet=silent_
 endif
 
-export quiet KBUILD_VERBOSE
+export quiet Q KBUILD_VERBOSE
 
 #	Paths to obj / src tree
 
@@ -142,7 +155,6 @@
 STRIP		= $(CROSS_COMPILE)strip
 OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
-MAKEFILES	= .config
 GENKSYMS	= /sbin/genksyms
 DEPMOD		= /sbin/depmod
 KALLSYMS	= /sbin/kallsyms
@@ -161,7 +173,8 @@
 
 export	VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
 	CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
-	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL
+	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE GENKSYMS PERL UTS_MACHINE \
+	HOSTCXX HOSTCXXFLAGS
 
 export CPPFLAGS NOSTDINC_FLAGS OBJCOPYFLAGS LDFLAGS
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
@@ -187,7 +200,7 @@
 
 .PHONY: scripts
 scripts:
-	+@$(call descend,scripts,)
+	+@$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts
 
 # Objects we will link into vmlinux / subdirs we need to visit
 # ---------------------------------------------------------------------------
@@ -201,7 +214,7 @@
 
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
-include-config := 1
+export include-config := 1
 
 -include .config
 
@@ -209,7 +222,7 @@
 
 include arch/$(ARCH)/Makefile
 
-core-y		+= kernel/ mm/ fs/ ipc/ security/
+core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/
 
 SUBDIRS		+= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
@@ -237,21 +250,7 @@
 
 #	In this section, we need .config
 
-#	If .config doesn't exist - tough luck
-
-.config: arch/$(ARCH)/config.in # FIXME $(shell find . -name Config.in)
-	@echo '***'
-	@if [ -f $@ ]; then \
-	  echo '*** The tree was updated, so your .config may be'; \
-	  echo '*** out of date!'; \
-	else \
-	  echo '*** You have not yet configured your kernel!'; \
-	fi
-	@echo '***'
-	@echo '*** Please run some configurator (e.g. "make oldconfig" or'
-	@echo '*** "make menuconfig" or "make xconfig").'
-	@echo '***'
-	@exit 1
+-include ..config.cmd
 
 ifdef CONFIG_MODULES
 export EXPORT_FLAGS := -DEXPORT_SYMTAB
@@ -306,7 +305,7 @@
 	  echo '  Generating build number'
 	  . scripts/mkversion > .tmp_version
 	  mv -f .tmp_version .version
-	  +$(call descend,init,)
+	  $(Q)$(MAKE) -f scripts/Makefile.build obj=init
 	)
 	$(call cmd,vmlinux__)
 	echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
@@ -365,7 +364,7 @@
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS): .hdepend prepare
-	+@$(call descend,$@,)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$@
 
 #	Things we need done before we descend to build or make
 #	module versions are listed in "prepare"
@@ -388,17 +387,17 @@
 # ---------------------------------------------------------------------------
 
 %.s: %.c scripts FORCE
-	+@$(call descend,$(@D),$@)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
 %.i: %.c scripts FORCE
-	+@$(call descend,$(@D),$@)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
 %.o: %.c scripts FORCE
-	+@$(call descend,$(@D),$@)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
 %.lst: %.c scripts FORCE
-	+@$(call descend,$(@D),$@)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
 %.s: %.S scripts FORCE
-	+@$(call descend,$(@D),$@)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
 %.o: %.S scripts FORCE
-	+@$(call descend,$(@D),$@)
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
 
 # 	FIXME: The asm symlink changes when $(ARCH) changes. That's
 #	hard to detect, but I suppose "make mrproper" is a good idea
@@ -419,11 +418,8 @@
 # 	with it and forgot to run make oldconfig
 
 include/linux/autoconf.h: .config
-	@echo '***'
-	@echo '*** You changed .config w/o running make *config?'
-	@echo '*** Please run "make oldconfig"'
-	@echo '***'
-	@exit 1
+	+@$(call descend,scripts/kconfig,scripts/kconfig/conf)
+	./scripts/kconfig/conf -s arch/$(ARCH)/Kconfig
 
 # Generate some files
 # ---------------------------------------------------------------------------
@@ -472,9 +468,11 @@
 
 # 	Update modversions.h, but only if it would change.
 
-include/linux/modversions.h: FORCE
+.PHONY: __rm_tmp_export-objs
+__rm_tmp_export-objs: 
 	@rm -rf .tmp_export-objs
-	@$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS))
+
+include/linux/modversions.h: $(patsubst %,_modver_%,$(SUBDIRS))
 	@echo -n '  Generating $@'
 	@( echo "#ifndef _LINUX_MODVERSIONS_H";\
 	   echo "#define _LINUX_MODVERSIONS_H"; \
@@ -487,8 +485,9 @@
 	) > $@.tmp; \
 	$(update-if-changed)
 
-$(patsubst %,_sfdep_%,$(SUBDIRS)): FORCE
-	+@$(call descend,$(patsubst _sfdep_%,%,$@),fastdep)
+.PHONY: $(patsubst %, _modver_%, $(SUBDIRS))
+$(patsubst %, _modver_%, $(SUBDIRS)): __rm_tmp_export-objs
+	$(Q)$(MAKE) -f scripts/Makefile.modver obj=$(patsubst _modver_%,%,$@)
 
 else # !CONFIG_MODVERSIONS
 
@@ -540,8 +539,7 @@
 
 .PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
 $(patsubst %, _modinst_%, $(SUBDIRS)) :
-	+@$(call descend,$(patsubst _modinst_%,%,$@),modules_install)
-
+	$(Q)$(MAKE) -f scripts/Makefile.modinst obj=$(patsubst _modinst_%,%,$@)
 else # CONFIG_MODULES
 
 # Modules not configured
@@ -637,34 +635,36 @@
 .PHONY: oldconfig xconfig menuconfig config \
 	make_with_config
 
-xconfig:
-	+@$(call descend,scripts,scripts/kconfig.tk)
-	wish -f scripts/kconfig.tk
+scripts/kconfig/conf scripts/kconfig/mconf scripts/kconfig/qconf: scripts/fixdep FORCE
+	+@$(call descend,scripts/kconfig,$@)
+
+xconfig: scripts/kconfig/qconf
+	./scripts/kconfig/qconf arch/$(ARCH)/Kconfig
 
-menuconfig:
-	+@$(call descend,scripts,lxdialog)
-	$(CONFIG_SHELL) $(src)/scripts/Menuconfig arch/$(ARCH)/config.in
+menuconfig: scripts/kconfig/mconf
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts lxdialog
+	./scripts/kconfig/mconf arch/$(ARCH)/Kconfig
 
-config:
-	$(CONFIG_SHELL) $(src)/scripts/Configure arch/$(ARCH)/config.in
+config: scripts/kconfig/conf
+	./scripts/kconfig/conf arch/$(ARCH)/Kconfig
 
-oldconfig:
-	$(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in
+oldconfig: scripts/kconfig/conf
+	./scripts/kconfig/conf -o arch/$(ARCH)/Kconfig
 
-randconfig:
-	$(CONFIG_SHELL) $(src)/scripts/Configure -r arch/$(ARCH)/config.in
+randconfig: scripts/kconfig/conf
+	./scripts/kconfig/conf -r arch/$(ARCH)/Kconfig
 
-allyesconfig:
-	$(CONFIG_SHELL) $(src)/scripts/Configure -y arch/$(ARCH)/config.in
+allyesconfig: scripts/kconfig/conf
+	./scripts/kconfig/conf -y arch/$(ARCH)/Kconfig
 
-allnoconfig:
-	$(CONFIG_SHELL) $(src)/scripts/Configure -n arch/$(ARCH)/config.in
+allnoconfig: scripts/kconfig/conf
+	./scripts/kconfig/conf -n arch/$(ARCH)/Kconfig
 
-allmodconfig:
-	$(CONFIG_SHELL) $(src)/scripts/Configure -m arch/$(ARCH)/config.in
+allmodconfig: scripts/kconfig/conf
+	./scripts/kconfig/conf -m arch/$(ARCH)/Kconfig
 
-defconfig:
-	yes '' | $(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in
+defconfig: scripts/kconfig/conf
+	./scripts/kconfig/conf -d arch/$(ARCH)/Kconfig
 
 ###
 # Cleaning is done on three levels.
@@ -698,7 +698,7 @@
 clean-dirs += $(ALL_SUBDIRS) Documentation/DocBook scripts
 
 $(addprefix _clean_,$(clean-dirs)):
-	$(MAKE) MAKEFILES= -rR -f scripts/Makefile.clean obj=$(patsubst _clean_%,%,$@)
+	$(Q)$(MAKE) -f scripts/Makefile.clean obj=$(patsubst _clean_%,%,$@)
 
 quiet_cmd_rmclean = RM  $$(CLEAN_FILES)
 cmd_rmclean	  = rm -f $(CLEAN_FILES)
@@ -799,7 +799,7 @@
 # Documentation targets
 # ---------------------------------------------------------------------------
 sgmldocs psdocs pdfdocs htmldocs: scripts
-	+@$(call descend,Documentation/DocBook,$@)
+	$(Q)$(MAKE) -f Documentation/DocBook/Makefile $@
 
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------
@@ -834,12 +834,10 @@
 # FIXME Should go into a make.lib or something 
 # ===========================================================================
 
-echo_target = $@
-
 a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \
 	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
 
-quiet_cmd_as_s_S = CPP     $(echo_target)
+quiet_cmd_as_s_S = CPP     $@
 cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
 
 # read all saved command lines
@@ -886,13 +884,9 @@
 		mv -f $@.tmp $@; \
 	fi
 endef
-
 #	$(call descend,<dir>,<target>)
-#	Recursively call a sub-make in <dir> with target <target> 
+#	Recursively call a sub-make in <dir> with target <target>
 
-ifeq ($(KBUILD_VERBOSE),1)
-descend = echo '$(MAKE) -f $(1)/Makefile $(2)';
-endif
-descend += $(MAKE) -f $(1)/Makefile obj=$(1) $(2)
+descend = $(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2)
 
 FORCE:

[LV-k25-commit] CVS: kernel-2.5 Rules.make,1.25,1.26

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv10114

Modified Files:
	Rules.make 
Log Message:
Rules.make is no longer used in 2.5.45


Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Rules.make	26 Mar 2003 00:06:45 -0000	1.25
+++ Rules.make	21 Apr 2003 23:01:38 -0000	1.26
@@ -1,628 +1 @@
 
-ifndef no-rules.make
-
-#
-# This file contains rules which are shared between multiple Makefiles.
-#
-
-# Some standard vars
-
-comma   := ,
-empty   :=
-space   := $(empty) $(empty)
-
-# Some bug traps
-# ---------------------------------------------------------------------------
-
-ifdef O_TARGET
-$(error kbuild: $(obj)/Makefile - Usage of O_TARGET := $(O_TARGET) is obsolete in 2.5. Please fix!)
-endif
-
-ifdef L_TARGET
-ifneq ($(L_TARGET),lib.a)
-$(warning kbuild: $(obj)/Makefile - L_TARGET := $(L_TARGET) target shall be renamed to lib.a. Please fix!)
-endif
-endif
-
-ifdef list-multi
-$(warning kbuild: $(obj)/Makefile - list-multi := $(list-multi) is obsolete in 2.5. Please fix!)
-endif
-
-# Some paths for the Makefiles to use
-# ---------------------------------------------------------------------------
-
-# FIXME. For now, we leave it possible to use make -C or make -f
-# to do work in subdirs.
-
-ifndef obj
-obj = .
-CFLAGS := $(patsubst -I%,-I$(TOPDIR)/%,$(patsubst -I$(TOPDIR)/%,-I%,$(CFLAGS)))
-AFLAGS := $(patsubst -I%,-I$(TOPDIR)/%,$(patsubst -I$(TOPDIR)/%,-I%,$(AFLAGS)))
-endif
-
-# For use in the quiet output
-echo_target = $@
-
-# Usage:
-#
-# $(obj)/target.o                     : target.o in the build dir
-# $(src)/target.c                     : target.c in the source dir
-# $(objtree)/include/linux/version.h  : Some file relative to the build
-#					dir root
-# $(srctree)/include/linux/module.h   : Some file relative to the source
-#				        dir root
-#
-# $(obj) and $(src) can only be used in the section after
-# include $(TOPDIR)/Rules.make, i.e for generated files and the like.
-# Intentionally.
-#
-# We don't support separate source / object yet, so these are just
-# placeholders for now
-
-src := $(obj)
-
-# Figure out what we need to build from the various variables
-# ===========================================================================
-
-# When an object is listed to be built compiled-in and modular,
-# only build the compiled-in version
-
-obj-m := $(filter-out $(obj-y),$(obj-m))
-
-# Handle objects in subdirs
-# ---------------------------------------------------------------------------
-# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
-#   and add the directory to the list of dirs to descend into: $(subdir-y)
-# o if we encounter foo/ in $(obj-m), remove it from $(obj-m) 
-#   and add the directory to the list of dirs to descend into: $(subdir-m)
-
-__subdir-y	:= $(patsubst %/,%,$(filter %/, $(obj-y)))
-subdir-y	+= $(__subdir-y)
-__subdir-m	:= $(patsubst %/,%,$(filter %/, $(obj-m)))
-subdir-m	+= $(__subdir-m)
-__subdir-n	:= $(patsubst %/,%,$(filter %/, $(obj-n)))
-subdir-n	+= $(__subdir-n)
-__subdir-	:= $(patsubst %/,%,$(filter %/, $(obj-)))
-subdir-		+= $(__subdir-)
-obj-y		:= $(patsubst %/, %/built-in.o, $(obj-y))
-obj-m		:= $(filter-out %/, $(obj-m))
-
-# Subdirectories we need to descend into
-
-subdir-ym	:= $(sort $(subdir-y) $(subdir-m))
-subdir-ymn      := $(sort $(subdir-ym) $(subdir-n) $(subdir-))
-
-# export.o is never a composite object, since $(export-objs) has a
-# fixed meaning (== objects which EXPORT_SYMBOL())
-__obj-y = $(filter-out export.o,$(obj-y))
-__obj-m = $(filter-out export.o,$(obj-m))
-
-# if $(foo-objs) exists, foo.o is a composite object 
-multi-used-y := $(sort $(foreach m,$(__obj-y), $(if $($(m:.o=-objs)), $(m))))
-multi-used-m := $(sort $(foreach m,$(__obj-m), $(if $($(m:.o=-objs)), $(m))))
-
-# Build list of the parts of our composite objects, our composite
-# objects depend on those (obviously)
-multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)))
-multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)))
-
-# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live
-# in the local directory
-subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
-
-# Replace multi-part objects by their individual parts, look at local dir only
-real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m))) $(EXTRA_TARGETS)
-real-objs-m := $(foreach m, $(obj-m), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m)))
-
-# Only build module versions for files which are selected to be built
-export-objs := $(filter $(export-objs),$(real-objs-y) $(real-objs-m))
-
-host-progs-single     := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
-host-progs-multi      := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
-host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
-
-# Add subdir path
-
-EXTRA_TARGETS	:= $(addprefix $(obj)/,$(EXTRA_TARGETS))
-obj-y		:= $(addprefix $(obj)/,$(obj-y))
-obj-m		:= $(addprefix $(obj)/,$(obj-m))
-export-objs	:= $(addprefix $(obj)/,$(export-objs))
-subdir-obj-y	:= $(addprefix $(obj)/,$(subdir-obj-y))
-real-objs-y	:= $(addprefix $(obj)/,$(real-objs-y))
-real-objs-m	:= $(addprefix $(obj)/,$(real-objs-m))
-multi-used-y	:= $(addprefix $(obj)/,$(multi-used-y))
-multi-used-m	:= $(addprefix $(obj)/,$(multi-used-m))
-multi-objs-y	:= $(addprefix $(obj)/,$(multi-objs-y))
-multi-objs-m	:= $(addprefix $(obj)/,$(multi-objs-m))
-subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))
-subdir-ymn	:= $(addprefix $(obj)/,$(subdir-ymn))
-clean-files	:= $(addprefix $(obj)/,$(clean-files))
-host-progs	:= $(addprefix $(obj)/,$(host-progs))
-host-progs-single     := $(addprefix $(obj)/,$(host-progs-single))
-host-progs-multi      := $(addprefix $(obj)/,$(host-progs-multi))
-host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))
-
-# The temporary file to save gcc -MD generated dependencies must not
-# contain a comma
-depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
-
-# We're called for one of four purposes:
-# o subdirclean: Delete intermidiate files in the current directory
-# o fastdep: build module version files (.ver) for $(export-objs) in
-#   the current directory
-# o modules_install: install the modules in the current directory
-# o build: When no target is given, first_rule is the default and
-#   will build the built-in and modular objects in this dir
-#   (or a subset thereof, depending on $(KBUILD_MODULES),$(KBUILD_BUILTIN)
-#   When targets are given directly (like foo.o), we just build these
-#   targets (That happens when someone does make some/dir/foo.[ois])
-
-ifeq ($(MAKECMDGOALS),subdirclean)
-
-__clean-files := $(wildcard $(EXTRA_TARGETS) $(host-progs) $(clean-files))
-
-subdirclean: $(subdir-ymn)
-ifneq ($(strip $(__clean-files) $(clean-rule)),)
-	rm -f $(__clean-files)
-	$(clean-rule)
-else
-	@:
-endif
-
-else
-ifeq ($(MAKECMDGOALS),fastdep)
-
-# ===========================================================================
-# Module versions
-# ===========================================================================
-
-ifeq ($(strip $(export-objs)),)
-
-# If we don't export any symbols in this dir, just descend
-# ---------------------------------------------------------------------------
-
-fastdep: $(subdir-ym)
-	@:
-
-else
-
-# This sets version suffixes on exported symbols
-# ---------------------------------------------------------------------------
-
-MODVERDIR := include/linux/modules
-
-#
-# Added the SMP separator to stop module accidents between uniprocessor
-# and SMP Intel boxes - AC - from bits by Michael Chastain
-#
-
-ifdef CONFIG_SMP
-	genksyms_smp_prefix := -p smp_
-else
-	genksyms_smp_prefix := 
-endif
-
-#	Don't include modversions.h, we're just about to generate it here.
-
-CFLAGS_MODULE := $(filter-out -include linux/modversions.h,$(CFLAGS_MODULE))
-
-$(addprefix $(MODVERDIR)/,$(real-objs-y:.o=.ver)): modkern_cflags := $(CFLAGS_KERNEL)
-$(addprefix $(MODVERDIR)/,$(real-objs-m:.o=.ver)): modkern_cflags := $(CFLAGS_MODULE)
-$(addprefix $(MODVERDIR)/,$(export-objs:.o=.ver)): export_flags   := -D__GENKSYMS__
-
-c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
-	  $(modkern_cflags) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) \
-	  -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) \
-	  $(export_flags) 
-
-# Our objects only depend on modversions.h, not on the individual .ver
-# files (fix-dep filters them), so touch modversions.h if any of the .ver
-# files changes
-
-quiet_cmd_cc_ver_c = MKVER   include/linux/modules/$*.ver
-cmd_cc_ver_c = $(CPP) $(c_flags) $< | $(GENKSYMS) $(genksyms_smp_prefix) \
-		 -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp
-
-# Okay, let's explain what's happening in rule_make_cc_ver_c:
-# o echo the command
-# o execute the command
-# o If the $(CPP) fails, we won't notice because it's output is piped
-#   to $(GENKSYMS) which does not fail. We recognize this case by
-#   looking if the generated $(depfile) exists, though.
-# o If the .ver file changed, touch modversions.h, which is our maker
-#   of any changed .ver files.
-# o Move command line and deps into their normal .*.cmd place.  
-
-define rule_cc_ver_c
-	$(if $($(quiet)cmd_cc_ver_c),echo '  $($(quiet)cmd_cc_ver_c)';) \
-	$(cmd_cc_ver_c); \
-	if [ ! -r $(depfile) ]; then exit 1; fi; \
-	scripts/fixdep $(depfile) $@ '$(cmd_cc_ver_c)' > $(@D)/.$(@F).tmp; \
-	rm -f $(depfile); \
-	if [ ! -r $@ ] || cmp -s $@ $@.tmp; then \
-	  touch include/linux/modversions.h; \
-	fi; \
-	mv -f $@.tmp $@
-	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
-endef
-
-$(MODVERDIR)/%.ver: %.c FORCE
-	@$(call if_changed_rule,cc_ver_c)
-
-targets := $(addprefix $(MODVERDIR)/,$(export-objs:.o=.ver))
-
-fastdep: $(targets) $(subdir-ym)
-	@mkdir -p $(dir $(addprefix .tmp_export-objs/modules/,$(export-objs:.o=.ver)))
-	@touch $(addprefix .tmp_export-objs/modules/,$(export-objs:.o=.ver))
-
-endif # export-objs 
-
-else # ! fastdep
-ifeq ($(MAKECMDGOALS),modules_install)
-
-# ==========================================================================
-# Installing modules
-# ==========================================================================
-
-quiet_cmd_modules_install = INSTALL $(obj-m)
-cmd_modules_install = mkdir -p $(MODLIB)/kernel/$(obj); \
-		      cp $(obj-m) $(MODLIB)/kernel/$(obj)
-
-.PHONY: modules_install
-
-modules_install: $(subdir-ym)
-ifneq ($(obj-m),)
-	$(call cmd,modules_install)
-else
-	@:
-endif
-
-else # ! modules_install
-
-# ==========================================================================
-# Building
-# ==========================================================================
-
-# If a Makefile does not define a L_TARGET, link an object called "built-in.o"
-
-ifdef L_TARGET
-L_TARGET := $(obj)/$(L_TARGET)
-else
-O_TARGET := $(obj)/built-in.o
-endif
-
-first_rule: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
-	    $(if $(KBUILD_MODULES),$(obj-m)) \
-	    $(subdir-ym)
-	@:
-
-# define listing_o_c to get compiler listings from .c -> .o compilations
-listing_o_c = -Wa,-adnhls=$(subst $(comma),_,$(@D)/$(*F)).lst -g
-
-# Compile C sources (.c)
-# ---------------------------------------------------------------------------
-
-# Default is built-in, unless we know otherwise
-modkern_cflags := $(CFLAGS_KERNEL)
-
-$(real-objs-m)        : modkern_cflags := $(CFLAGS_MODULE)
-$(real-objs-m:.o=.i)  : modkern_cflags := $(CFLAGS_MODULE)
-$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)
-
-$(export-objs)        : export_flags   := $(EXPORT_FLAGS)
-$(export-objs:.o=.i)  : export_flags   := $(EXPORT_FLAGS)
-$(export-objs:.o=.s)  : export_flags   := $(EXPORT_FLAGS)
-$(export-objs:.o=.lst): export_flags   := $(EXPORT_FLAGS)
-
-c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
-	  $(modkern_cflags) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) \
-	  -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) \
-	  $(export_flags) 
-
-quiet_cmd_cc_s_c = CC      $(echo_target)
-cmd_cc_s_c       = $(CC) $(c_flags) -S -o $@ $< 
-
-%.s: %.c FORCE
-	$(call if_changed_dep,cc_s_c)
-
-quiet_cmd_cc_i_c = CPP     $(echo_target)
-cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
-
-%.i: %.c FORCE
-	$(call if_changed_dep,cc_i_c)
-
-quiet_cmd_cc_o_c = CC      $(echo_target)
-cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $< $(listing_o_c)
-
-%.o: %.c FORCE
-	$(call if_changed_dep,cc_o_c)
-
-quiet_cmd_cc_lst_c = MKLST   $(echo_target)
-cmd_cc_lst_c       = $(CC) $(c_flags) -g -c -o $*.o $< && sh scripts/makelst $*.o System.map $(OBJDUMP) > $@
-
-%.lst: %.c FORCE
-	$(call if_changed_dep,cc_lst_c)
-
-# Compile assembler sources (.S)
-# ---------------------------------------------------------------------------
-
-modkern_aflags := $(AFLAGS_KERNEL)
-
-$(real-objs-m)      : modkern_aflags := $(AFLAGS_MODULE)
-$(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
-
-a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \
-	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
-
-quiet_cmd_as_s_S = CPP     $(echo_target)
-cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
-
-%.s: %.S FORCE
-	$(call if_changed_dep,as_s_S)
-
-quiet_cmd_as_o_S = AS      $(echo_target)
-cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
-
-%.o: %.S FORCE
-	$(call if_changed_dep,as_o_S)
-
-targets += $(real-objs-y) $(real-objs-m) $(EXTRA_TARGETS) $(MAKECMDGOALS)
-
-# Build the compiled-in targets
-# ---------------------------------------------------------------------------
-
-# To build objects in subdirs, we need to descend into the directories
-$(sort $(subdir-obj-y)): $(subdir-ym) ;
-
-#
-# Rule to compile a set of .o files into one .o file
-#
-ifdef O_TARGET
-quiet_cmd_link_o_target = LD      $(echo_target)
-# If the list of objects to link is empty, just create an empty O_TARGET
-cmd_link_o_target = $(if $(strip $(obj-y)),\
-		      $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(obj-y), $^),\
-		      rm -f $@; $(AR) rcs $@)
-
-$(O_TARGET): $(obj-y) FORCE
-	$(call if_changed,link_o_target)
-
-targets += $(O_TARGET)
-endif # O_TARGET
-
-#
-# Rule to compile a set of .o files into one .a file
-#
-ifdef L_TARGET
-quiet_cmd_link_l_target = AR      $(echo_target)
-cmd_link_l_target = rm -f $@; $(AR) $(EXTRA_ARFLAGS) rcs $@ $(obj-y)
-
-$(L_TARGET): $(obj-y) FORCE
-	$(call if_changed,link_l_target)
-
-targets += $(L_TARGET)
-endif
-
-#
-# Rule to link composite objects
-#
-
-quiet_cmd_link_multi = LD      $(echo_target)
-cmd_link_multi = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(addprefix $(obj)/,$($(subst $(obj)/,,$(@:.o=-objs)))),$^)
-
-# We would rather have a list of rules like
-# 	foo.o: $(foo-objs)
-# but that's not so easy, so we rather make all composite objects depend
-# on the set of all their parts
-$(multi-used-y) : %.o: $(multi-objs-y) FORCE
-	$(call if_changed,link_multi)
-
-$(multi-used-m) : %.o: $(multi-objs-m) FORCE
-	$(call if_changed,link_multi)
-
-targets += $(multi-used-y) $(multi-used-m)
-
-# Compile programs on the host
-# ===========================================================================
-
-quiet_cmd_host_cc__c  = HOSTCC  $(echo_target)
-cmd_host_cc__c        = $(HOSTCC) -Wp,-MD,$(depfile) \
-			$(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \
-			$(HOST_LOADLIBES) -o $@ $<
-
-$(host-progs-single): %: %.c FORCE
-	$(call if_changed_dep,host_cc__c)
-
-quiet_cmd_host_cc_o_c = HOSTCC  $(echo_target)
-cmd_host_cc_o_c       = $(HOSTCC) -Wp,-MD,$(depfile) \
-			$(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
-
-$(host-progs-multi-objs): %.o: %.c FORCE
-	$(call if_changed_dep,host_cc_o_c)
-
-quiet_cmd_host_cc__o  = HOSTLD  $(echo_target)
-cmd_host_cc__o        = $(HOSTCC) $(HOSTLDFLAGS) -o $@ $(addprefix $(obj)/,$($(subst $(obj)/,,$@)-objs)) \
-			$(HOST_LOADLIBES)
-
-$(host-progs-multi): %: $(host-progs-multi-objs) FORCE
-	$(call if_changed,host_cc__o)
-
-targets += $(host-progs-single) $(host-progs-multi-objs) $(host-progs-multi) 
-
-endif # ! subdirclean
-endif # ! modules_install
-endif # ! fastdep
-
-# Shipped files
-# ===========================================================================
-
-quiet_cmd_shipped = SHIPPED $(echo_target)
-cmd_shipped = cat $< > $@
-
-%:: %_shipped
-	$(call cmd,shipped)
-
-# Commands useful for building a boot image
-# ===========================================================================
-# 
-#	Use as following:
-#
-#	target: source(s) FORCE
-#		$(if_changed,ld/objcopy/gzip)
-#
-#	and add target to EXTRA_TARGETS so that we know we have to
-#	read in the saved command line
-
-# Linking
-# ---------------------------------------------------------------------------
-
-quiet_cmd_ld = LD      $(echo_target)
-cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
-	       $(filter-out FORCE,$^) -o $@ 
-
-# Objcopy
-# ---------------------------------------------------------------------------
-
-quiet_cmd_objcopy = OBJCOPY $(echo_target)
-cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
-
-# Gzip
-# ---------------------------------------------------------------------------
-
-quiet_cmd_gzip = GZIP    $(echo_target)
-cmd_gzip = gzip -f -9 < $< > $@
-
-# ===========================================================================
-# Generic stuff
-# ===========================================================================
-
-# Descending
-# ---------------------------------------------------------------------------
-
-.PHONY: $(subdir-ymn)
-
-$(subdir-ymn):
-	+@$(call descend,$@,$(MAKECMDGOALS))
-
-# Add FORCE to the prequisites of a target to force it to be always rebuilt.
-# ---------------------------------------------------------------------------
-
-.PHONY: FORCE
-
-FORCE:
-
-#
-# This sets version suffixes on exported symbols
-# Separate the object into "normal" objects and "exporting" objects
-# Exporting objects are: all objects that define symbol tables
-#
-
-# ---------------------------------------------------------------------------
-# Check if command line has changed
-
-# Usage:
-# normally one uses rules like
-#
-# %.o: %.c
-# 	<command line>
-#
-# However, these only rebuild the target when the source has changed,
-# but not when e.g. the command or the flags on the command line changed.
-#
-# This extension allows to do the following:
-#
-# command = <command line>
-#
-# %.o: %.c dummy
-#	$(call if_changed,command)
-#
-# which will make sure to rebuild the target when either its prerequisites
-# change or the command line changes
-#
-# The magic works as follows:
-# The addition of dummy to the dependencies causes the rule for rebuilding
-# to be always executed. However, the if_changed function will generate
-# an empty command when 
-# o none of the prequesites changed (i.e $? is empty)
-# o the command line did not change (we compare the old command line,
-#   which is saved in .<target>.o, to the current command line using
-#   the two filter-out commands)
-
-# Read all saved command lines and dependencies for the $(targets) we
-# may be building above, using $(if_changed{,_dep}). As an
-# optimization, we don't need to read them if the target does not
-# exist, we will rebuild anyway in that case.
-
-targets := $(wildcard $(sort $(targets)))
-cmd_files := $(wildcard $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
-
-ifneq ($(cmd_files),)
-  include $(cmd_files)
-endif
-
-# function to only execute the passed command if necessary
-
-if_changed = $(if $(strip $? \
-		          $(filter-out $(cmd_$(1)),$(cmd_$@))\
-			  $(filter-out $(cmd_$@),$(cmd_$(1)))),\
-	@set -e; \
-	$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) \
-	$(cmd_$(1)); \
-	echo 'cmd_$@ := $(cmd_$(1))' > $(@D)/.$(@F).cmd)
-
-
-# execute the command and also postprocess generated .d dependencies
-# file
-
-if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
-		          $(filter-out $(cmd_$(1)),$(cmd_$@))\
-			  $(filter-out $(cmd_$@),$(cmd_$(1)))),\
-	@set -e; \
-	$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) \
-	$(cmd_$(1)); \
-	scripts/fixdep $(depfile) $@ '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \
-	rm -f $(depfile); \
-	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
-
-# Usage: $(call if_changed_rule,foo)
-# will check if $(cmd_foo) changed, or any of the prequisites changed,
-# and if so will execute $(rule_foo)
-
-if_changed_rule = $(if $(strip $? \
-		               $(filter-out $(cmd_$(1)),$(cmd_$@))\
-			       $(filter-out $(cmd_$@),$(cmd_$(1)))),\
-			@set -e; \
-			mkdir -p $(dir $@); \
-			$(rule_$(1)))
-
-# If quiet is set, only print short version of command
-
-cmd = @$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
-
-# do_cmd is a shorthand used to support both compressed, verbose
-# and silent output in a single line.
-# Compared to cmd described avobe, do_cmd does no rely on any variables 
-# previously assigned a value.
-#
-# Usage $(call do_cmd,CMD   $@,cmd_to_execute bla bla)
-# Example:
-# $(call do_cmd,CP $@,cp -b $< $@)
-# make -s => nothing will be printed
-# make KBUILD_VERBOSE=1 => cp -b path/to/src.file path/to/dest.file
-# make KBUILD_VERBOSE=0 =>   CP path/to/dest.file
-define do_cmd
-        @$(if $(filter quiet_,$(quiet)), echo '  $(1)' &&,
-           $(if $(filter silent_,$(quiet)),,
-             echo "$(2)" &&)) \
-        $(2)
-endef
-
-#	$(call descend,<dir>,<target>)
-#	Recursively call a sub-make in <dir> with target <target> 
-
-ifeq ($(KBUILD_VERBOSE),1)
-descend = echo '$(MAKE) -f $(1)/Makefile $(2)';
-endif
-descend += $(MAKE) -f $(1)/Makefile obj=$(1) $(2)
-
-endif

[LV-k25-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.13,1.14 Config.help,1.1.1.3,NONE Config.in,1.1.1.8,NONE scsi_merge.c,1.12,NONE sd.h,1.1.1.7,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/scsi

Modified Files:
	Makefile 
Removed Files:
	Config.help Config.in scsi_merge.c sd.h 
Log Message:
Merge with 2.5.45


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	26 Mar 2003 00:06:46 -0000	1.13
+++ Makefile	21 Apr 2003 22:55:54 -0000	1.14
@@ -65,6 +65,7 @@
 obj-$(CONFIG_SCSI_FUTURE_DOMAIN)+= fdomain.o
 obj-$(CONFIG_SCSI_IN2000)	+= in2000.o
 obj-$(CONFIG_SCSI_GENERIC_NCR5380) += g_NCR5380.o
+obj-$(CONFIG_SCSI_GENERIC_NCR5380_MMIO) += g_NCR5380_mmio.o
 obj-$(CONFIG_SCSI_NCR53C406A)	+= NCR53c406a.o
 obj-$(CONFIG_SCSI_NCR_D700)	+= NCR_D700.o 53c700.o
 obj-$(CONFIG_SCSI_SYM53C416)	+= sym53c416.o
@@ -128,8 +129,8 @@
 obj-$(CONFIG_CHR_DEV_SG)	+= sg.o
 
 scsi_mod-objs	:= scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
-			scsi_proc.o scsi_error.o scsi_lib.o scsi_merge.o \
-			scsi_scan.o scsi_syms.o
+			scsi_proc.o scsi_error.o scsi_lib.o scsi_scan.o \
+			scsi_syms.o
 			
 sd_mod-objs	:= sd.o
 sr_mod-objs	:= sr.o sr_ioctl.o sr_vendor.o

--- Config.help DELETED ---

--- Config.in DELETED ---

--- scsi_merge.c DELETED ---

--- sd.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/net Space.c,1.6,1.7 Config.help,1.1.1.6,NONE Config.in,1.1.1.13,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/net

Modified Files:
	Space.c 
Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Space.c	10 Feb 2003 02:23:43 -0000	1.6
+++ Space.c	21 Apr 2003 22:55:50 -0000	1.7
@@ -54,7 +54,6 @@
 extern int ne_probe(struct net_device *dev);
 extern int hp_probe(struct net_device *dev);
 extern int hp_plus_probe(struct net_device *dev);
-extern int znet_probe(struct net_device *);
 extern int express_probe(struct net_device *);
 extern int eepro_probe(struct net_device *);
 extern int el3_probe(struct net_device *);
@@ -271,9 +270,6 @@
 #endif
 #ifdef CONFIG_ETH16I
 	{eth16i_probe, 0},	/* ICL EtherTeam 16i/32 */
-#endif
-#ifdef CONFIG_ZNET		/* Zenith Z-Note and some IBM Thinkpads. */
-	{znet_probe, 0},
 #endif
 #ifdef CONFIG_EEXPRESS		/* Intel EtherExpress */
 	{express_probe, 0},

--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.27,1.28 Config.help,1.1.1.13,NONE Config.in,1.1.1.15,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/char

Modified Files:
	Makefile 
Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile	26 Mar 2003 00:06:45 -0000	1.27
+++ Makefile	21 Apr 2003 22:55:37 -0000	1.28
@@ -7,14 +7,14 @@
 #
 FONTMAPFILE = cp437.uni
 
-obj-y	 += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o
+obj-y	 += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o eventpoll.o
 
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
 export-objs     :=	busmouse.o vt.o generic_serial.o ip2main.o \
 			ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \
-			selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
+			selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o eventpoll.o
 
 obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
 obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
@@ -112,7 +112,7 @@
 include $(TOPDIR)/Rules.make
 
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
-	$(call do_cmd,CONMK  $(echo_target),$(objtree)/scripts/conmakehash $< > $@)
+	$(call do_cmd,CONMK  $@,$(objtree)/scripts/conmakehash $< > $@)
 
 $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 

--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/zorro Config.help,1.1.1.1,NONE Config.in,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/zorro
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/zorro

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb/storage Config.help,1.1.1.4,NONE Config.in,1.1.1.4,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/storage
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/usb/storage

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/scsi/pcmcia Config.help,1.1.1.1,NONE Config.in,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi/pcmcia
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/scsi/pcmcia

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/video Config.help,1.1.1.5,NONE Config.in,1.1.1.12,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/video
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/video

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb/image Config.help,1.1.1.2,NONE Config.in,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/image
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/usb/image

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb/core Config.in,1.1.1.2,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/core
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/usb/core

Removed Files:
	Config.in 
Log Message:
Merge with 2.5.45


--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb/serial Config.help,1.1.1.5,NONE Config.in,1.1.1.8,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/serial
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/usb/serial

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/telephony Config.help,1.1.1.2,NONE Config.in,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/telephony
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/telephony

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/usb/net Config.help,1.1.1.1,NONE Config.in,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/usb/net
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/usb/net

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/serial Config.help,1.1.1.3,NONE Config.in,1.1.1.4,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/serial
In directory sc8-pr-cvs1:/tmp/cvs-serv7342/drivers/serial

Removed Files:
	Config.help Config.in 
Log Message:
Merge with 2.5.45


--- Config.help DELETED ---

--- Config.in DELETED ---