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

[LV-k25-commit] CVS: kernel-2.5/arch/vax Makefile,1.11,1.12

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

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

Modified Files:
	Makefile 
Log Message:
Remove archonly, diskbootx, mopbootx and linkonly targets.  They don't
work properly with the new kbuild.  My build machine is fast enough that
I can live without them for now, and I'm sure there are better ways to 
do it.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	29 Jan 2003 00:10:55 -0000	1.11
+++ Makefile	29 Jan 2003 00:30:36 -0000	1.12
@@ -52,28 +52,9 @@
 
 
 all: mopboot 
-archonly: mopbootx diskbootx
 
-vmlinux.bin: vmlinux FORCE
-	$(OBJCOPY) $(OBJCOPYFLAGS) $< $@
-
-header.bin:
-	dd if=/dev/zero of=header.bin bs=512 count=1
-
-# This target should re-compile anything that's changed
-mopboot: vmlinux.bin header.bin
-	cat header.bin vmlinux.bin > vmlinux.SYS
-	$(SETCMDLINE) vmlinux.SYS $(DEFAULT_CMDLINE)
-	
-# this is helpful for low level debuggery	
-listfile: 
-	rm -f vmlinux.lst
-	$(OBJDUMP) -D vmlinux > vmlinux.lst 
-
-# This target will only re-compile stuff that's changed in arch/vax
-mopbootx: linkonly vmlinux.bin header.bin
-	cat header.bin vmlinux.bin > vmlinux.SYS
-	$(SETCMDLINE)  vmlinux.SYS $(DEFAULT_CMDLINE)
+# This will make a MOP-bootable image
+mopboot: vmlinux.SYS
 
 # This will make a disk-bootable image.  dd this directly to a
 # disk and then tell your VAX to boot from this disk
@@ -84,32 +65,35 @@
 # use the vmlinux.SYS and something like asbl. Dont forget to
 # set the command line to something useful like "root=/dev/sda1"
 #
-diskboot: vmlinux.bin
-	$(MKBOOTBLK) vmlinux.bin > vmlinux.dsk
-	cat vmlinux.bin >> vmlinux.dsk
+diskboot: vmlinux.dsk
 	@echo " "
 	@echo "      Dont forget to set the kernel command line with"
 	@echo "   " $(SETCMDLINE)
 	@echo " "
 
+vmlinux.bin: vmlinux
+	$(OBJCOPY) $(OBJCOPYFLAGS) $< $@
 
-# ... and this one only rebuilds stuff in arch/vax
-diskbootx: linkonly vmlinux.bin
-	$(MKBOOTBLK) vmlinux.bin > vmlinux.dsk
-	cat vmlinux.bin >> vmlinux.dsk
-	@echo " "
-	@echo "      Dont forget to set the kernel command line with"
-	@echo "   " $(SETCMDLINE)
-	@echo " "
-
-linkonly: FORCE $(ARCHDIRS) $(TOOLSDIR)
-	@$(call rule_link_vmlinux)
+vmlinux.SYS: vmlinux.bin
+	dd if=/dev/zero bs=512 count=1 of=$@ 2>/dev/null
+	cat $< > $@
+	$(SETCMDLINE) $@ $(DEFAULT_CMDLINE)
+
+vmlinux.dsk: vmlinux.bin
+	$(MKBOOTBLK) $< > $@
+	cat $< >> $@
+	
+# this is helpful for low level debuggery	
+listfile: 
+	rm -f vmlinux.lst
+	$(OBJDUMP) -D vmlinux > vmlinux.lst 
 
 archclean:
 	rm -f vmlinux.* vmlinux
-	cd $(TOPDIR)/arch/vax ; rm -f *.out TEST.BIN TEST.SYS header.bin
+	cd $(TOPDIR)/arch/vax ; rm -f *.out TEST.BIN TEST.SYS
 	cd $(TOOLSDIR) ; rm -f setcmdline showcmdline mkbootblk
 	
 archmrproper:
 
 clean:  archclean
+

[LV-k25-commit] CVS: kernel-2.5/arch/vax/boot Makefile,1.5,1.6

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

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

Modified Files:
	Makefile 
Log Message:
Add archhelp target for 2.5.25's "make help" feature


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	29 Jan 2003 00:06:49 -0000	1.5
+++ Makefile	29 Jan 2003 00:27:40 -0000	1.6
@@ -13,3 +13,9 @@
 EXTRA_TARGETS = head.o
 
 include $(TOPDIR)/Rules.make
+
+# Top-level makefile expects archhelp here, but I'd rather put it
+# in arch/$(ARCH)/Makefile
+archhelp:
+	@echo  '* mopboot       - MOP-bootable image'
+	@echo  '* diskboot      - disk-bootable image'

[LV-k25-commit] CVS: kernel-2.5/arch/vax Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
kbuild wants LDFLAGS and LDFLAGS_vmlinux defined this way.  Also pull
some code duplication out into separate targets (vmlinux.bin and
header.bin generation).


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	27 Jan 2003 00:21:04 -0000	1.10
+++ Makefile	29 Jan 2003 00:10:55 -0000	1.11
@@ -13,8 +13,8 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-LD=$(CROSS_COMPILE)ld -m elf_vax
-OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
+LDFLAGS=-m elf_vax
+OBJCOPYFLAGS=-O binary -R .note -R .comment -S
 
 
 # Note that this CFLAGS definition will override the definition
@@ -24,7 +24,7 @@
 		
 # These flags are used by the top-level makefile when linking
 # the kernel
-LINKFLAGS=-T arch/vax/vmlinux.lds \
+LDFLAGS_vmlinux=-T arch/vax/vmlinux.lds \
           -N -nostartfiles -nostdlib \
           -noinhibit-exec -warn-once \
           -Map vmlinux.map -cref
@@ -54,13 +54,16 @@
 all: mopboot 
 archonly: mopbootx diskbootx
 
-# This target should re-compile anything that's changed
-mopboot: vmlinux
-	$(OBJCOPY) vmlinux -O binary vmlinux.bin
+vmlinux.bin: vmlinux FORCE
+	$(OBJCOPY) $(OBJCOPYFLAGS) $< $@
+
+header.bin:
 	dd if=/dev/zero of=header.bin bs=512 count=1
-	mv -f header.bin vmlinux.SYS
-	cat vmlinux.bin >> vmlinux.SYS
-	$(SETCMDLINE)  vmlinux.SYS $(DEFAULT_CMDLINE)
+
+# This target should re-compile anything that's changed
+mopboot: vmlinux.bin header.bin
+	cat header.bin vmlinux.bin > vmlinux.SYS
+	$(SETCMDLINE) vmlinux.SYS $(DEFAULT_CMDLINE)
 	
 # this is helpful for low level debuggery	
 listfile: 
@@ -68,11 +71,8 @@
 	$(OBJDUMP) -D vmlinux > vmlinux.lst 
 
 # This target will only re-compile stuff that's changed in arch/vax
-mopbootx: linkonly
-	$(OBJCOPY) vmlinux -O binary vmlinux.bin
-	dd if=/dev/zero of=header.bin bs=512 count=1
-	mv -f header.bin vmlinux.SYS
-	cat vmlinux.bin >> vmlinux.SYS
+mopbootx: linkonly vmlinux.bin header.bin
+	cat header.bin vmlinux.bin > vmlinux.SYS
 	$(SETCMDLINE)  vmlinux.SYS $(DEFAULT_CMDLINE)
 
 # This will make a disk-bootable image.  dd this directly to a
@@ -84,8 +84,7 @@
 # use the vmlinux.SYS and something like asbl. Dont forget to
 # set the command line to something useful like "root=/dev/sda1"
 #
-diskboot: vmlinux
-	$(OBJCOPY) vmlinux -O binary vmlinux.bin
+diskboot: vmlinux.bin
 	$(MKBOOTBLK) vmlinux.bin > vmlinux.dsk
 	cat vmlinux.bin >> vmlinux.dsk
 	@echo " "
@@ -95,8 +94,7 @@
 
 
 # ... and this one only rebuilds stuff in arch/vax
-diskbootx: linkonly
-	$(OBJCOPY) vmlinux -O binary vmlinux.bin
+diskbootx: linkonly vmlinux.bin
 	$(MKBOOTBLK) vmlinux.bin > vmlinux.dsk
 	cat vmlinux.bin >> vmlinux.dsk
 	@echo " "

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax param.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-serv10678/include/asm-vax

Modified Files:
	param.h 
Log Message:
2.5.25 needs a definition of USER_HZ.  And asm-i386/param.h protects
HZ with a $ifdef __KERNEL__.


Index: param.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/param.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- param.h	20 May 2002 00:33:39 -0000	1.3
+++ param.h	29 Jan 2003 00:09:25 -0000	1.4
@@ -2,8 +2,10 @@
 #define _VAX_PARAM_H
 
 /* FIXME: check this value */
-#ifndef HZ
-#define HZ 100
+#ifdef __KERNEL__
+#define HZ		100
+#define USER_HZ		100
+#define CLOCKS_PER_SEC	100	/* frequency at which times() counts */
 #endif
 
 #define EXEC_PAGESIZE	4096
@@ -17,9 +19,5 @@
 #endif
 
 #define MAXHOSTNAMELEN	64	/* max length of hostname */
-
-#ifdef __KERNEL__
-# define CLOCKS_PER_SEC	100	/* frequency at which times() counts */
-#endif
 
 #endif /* _VAX_PARAM_H */

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.30,1.31 Rules.make,1.16,1.17

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

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

Modified Files:
	Makefile Rules.make 
Log Message:
Merge with 2.5.25


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile	27 Jan 2003 01:28:21 -0000	1.30
+++ Makefile	29 Jan 2003 00:08:11 -0000	1.31
@@ -1,8 +1,14 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 24
+SUBLEVEL = 25
 EXTRAVERSION =
 
+# *DOCUMENTATION*
+# Too see a list of typical targets execute "make help"
+# More info can be located in ./Documentation/kbuild
+# Comments in this file is targeted only to the developer, do not
+# expect to learn how to build the kernel reading this file.
+
 # We are using a recursive build, so we need to do a little thinking
 # to get the ordering right.
 #
@@ -140,16 +146,23 @@
 	CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
 	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL
 
-export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS
+export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS OBJCOPYFLAGS
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
 export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
 
+src	:= .
+obj	:= .
+srctree := $(TOPDIR)
+objtree := $(TOPDIR)
+
+export srctree objtree
+
 SUBDIRS		:= init kernel mm fs ipc lib drivers sound net
 
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
 		    defconfig allyesconfig allnoconfig allmodconfig \
 		    clean mrproper distclean \
-		    tags TAGS sgmldocs psdocs pdfdocs htmldocs \
+		    help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
 		    checkconfig checkhelp checkincludes
 
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
@@ -217,7 +230,7 @@
 
 include arch/$(ARCH)/Makefile
 
-export	NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
+export	NETWORKS DRIVERS LIBS HEAD LDFLAGS MAKEBOOT ASFLAGS
 
 # boot target
 # ---------------------------------------------------------------------------
@@ -238,7 +251,7 @@
 vmlinux-objs := $(HEAD) $(INIT) $(CORE_FILES) $(LIBS) $(DRIVERS) $(NETWORKS)
 
 quiet_cmd_link_vmlinux = LD     $@
-cmd_link_vmlinux = $(LD) $(LINKFLAGS) $(HEAD) $(INIT) \
+cmd_link_vmlinux = $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $(HEAD) $(INIT) \
 		--start-group \
 		$(CORE_FILES) \
 		$(LIBS) \
@@ -255,7 +268,7 @@
 	. scripts/mkversion > .tmpversion
 	mv -f .tmpversion .version
 	+$(MAKE) -C init
-	$(call cmd,cmd_link_vmlinux)
+	$(call cmd,link_vmlinux)
 	$(cmd_link_vmlinux)
 	echo 'cmd_$@ := $(cmd_link_vmlinux)' > $(@D)/.$(@F).cmd
 	$(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
@@ -679,6 +692,43 @@
 	find $(SUBDIRS) init -name SCCS -prune -o -name BitKeeper -prune -o \
 		-name '*.[ch]' -print | xargs ctags $$CTAGSF -a
 
+# Brief documentation of the typical targets used
+# ---------------------------------------------------------------------------
+
+help:
+	@echo  'Cleaning targets:'
+	@echo  '  clean		- remove most generated files but keep the config'
+	@echo  '  mrproper	- remove all generated files including the config'
+	@echo  '  distclean	- mrproper + remove files generated by editors and patch'
+	@echo  ''
+	@echo  'Configuration targets:'
+	@echo  '  oldconfig	- Update current config utilising a line-oriented program'
+	@echo  '  menuconfig	- Update current config utilising a menu based program'
+	@echo  '  xconfig	- Update current config utilising a X-based program'
+	@echo  '  defconfig	- New config with default answer to all options'
+	@echo  '  allmodconfig	- New config selecting modules when possible'
+	@echo  '  allyesconfig	- New config where all options are accepted with yes'
+	@echo  '  allnoconfig	- New minimal config'
+	@echo  ''
+	@echo  'Other generic targets:'
+	@echo  '  all		- Build all targets marked with [*]'
+	@echo  '  dep           - Create module version information'
+	@echo  '* vmlinux	- Build the bare kernel'
+	@echo  '* modules	- Build all modules'
+	@echo  '  dir/file.[ois]- Build specified target only'
+	@echo  '  rpm		- Build a kernel as an RPM package'
+	@echo  '  tags/TAGS	- Generate tags file for editors'
+	@echo  ''
+	@echo  'Documentation targets:'
+	@$(MAKE) --no-print-directory -f Documentation/DocBook/Makefile dochelp
+	@echo  ''
+	@echo  'Architecture specific targets ($(ARCH)):'
+	@$(MAKE) --no-print-directory -f arch/$(ARCH)/boot/Makefile archhelp
+	@echo  ''
+	@echo  'Execute "make" or "make all" to build all targets marked with [*] '
+	@echo  'For further info browse Documentation/kbuild/*'
+ 
+
 # Documentation targets
 # ---------------------------------------------------------------------------
 
@@ -735,9 +785,9 @@
 			       $(filter-out $(cmd_$(@F)),$(cmd_$(1)))),\
 	               @$(rule_$(1)))
 
-# If quiet is set, only print short version of rule
+# If quiet is set, only print short version of command
 
-cmd = @$(if $($(quiet)$(1)),echo '  $($(quiet)$(1))' &&) $($(1))
+cmd = @$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
 
 define update-if-changed
 	if [ -r $@ ] && cmp -s $@ $@.tmp; then \

Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Rules.make	27 Jan 2003 01:28:21 -0000	1.16
+++ Rules.make	29 Jan 2003 00:08:12 -0000	1.17
@@ -34,7 +34,7 @@
 # $(srctree)/include/linux/module.h   : Some file relative to the source
 #				        dir root
 #
-# Those can only be used in the section after
+# $(obj) and $(src) can only be used in the section after
 # include $(TOPDIR)/Rules.make, i.e for generated files and the like.
 # Intentionally.
 #
@@ -43,8 +43,10 @@
 
 obj := .
 src := .
-objtree := $(TOPDIR)
-srctree := $(TOPDIR)
+
+# For use in the quiet output
+
+echo_target = $(RELDIR)/$@
 
 # Figure out what we need to build from the various variables
 # ===========================================================================
@@ -272,25 +274,25 @@
 	  -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) \
 	  $(export_flags) 
 
-quiet_cmd_cc_s_c = CC     $(RELDIR)/$@
+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    $(RELDIR)/$@
+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     $(RELDIR)/$@
+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 = '  Generating $(RELDIR)/$@'
+quiet_cmd_cc_lst_c = '  Generating $(echo_target)'
 cmd_cc_lst_c     = $(CC) $(c_flags) -g -c -o $*.o $< && $(TOPDIR)/scripts/makelst $*.o $(TOPDIR)/System.map $(OBJDUMP) > $@
 
 %.lst: %.c FORCE
@@ -307,13 +309,13 @@
 a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \
 	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
 
-quiet_cmd_as_s_S = CPP    $(RELDIR)/$@
+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     $(RELDIR)/$@
+quiet_cmd_as_o_S = AS     $(echo_target)
 cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
 
 %.o: %.S FORCE
@@ -331,10 +333,10 @@
 # Rule to compile a set of .o files into one .o file
 #
 ifdef O_TARGET
-quiet_cmd_link_o_target = LD     $(RELDIR)/$@
+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) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(obj-y), $^),\
+		      $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(obj-y), $^),\
 		      rm -f $@; $(AR) rcs $@)
 
 $(O_TARGET): $(obj-y) FORCE
@@ -347,7 +349,7 @@
 # Rule to compile a set of .o files into one .a file
 #
 ifdef L_TARGET
-quiet_cmd_link_l_target = AR     $(RELDIR)/$@
+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
@@ -360,8 +362,8 @@
 # Rule to link composite objects
 #
 
-quiet_cmd_link_multi = LD     $(RELDIR)/$@
-cmd_link_multi = $(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs),$^)
+quiet_cmd_link_multi = LD     $(echo_target)
+cmd_link_multi = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs),$^)
 
 # We would rather have a list of rules like
 # 	foo.o: $(foo-objs)
@@ -382,22 +384,22 @@
 host-progs-multi      := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
 host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
 
-quiet_cmd_host_cc__c  = HOSTCC $(RELDIR)/$@
-cmd_host_cc__c        = $(HOSTCC) -Wp,-MD,.$(subst /,_,$@).d \
+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 $(RELDIR)/$@
-cmd_host_cc_o_c       = $(HOSTCC) -Wp,-MD,.$(subst /,_,$@).d \
+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 $(RELDIR)/$@
+quiet_cmd_host_cc__o  = HOSTLD $(echo_target)
 cmd_host_cc__o        = $(HOSTCC) $(HOSTLDFLAGS) -o $@ $($@-objs) \
 			$(HOST_LOADLIBES)
 
@@ -413,9 +415,39 @@
 # ===========================================================================
 
 %:: %_shipped
-	@echo '  CP     $(RELDIR)/$@'
+	@echo '  CP     $(echo_target)'
 	@cp $< $@
 
+# Commands useful for building a boot image
+# ===========================================================================
+# 
+#	Use as following:
+#
+#	target: source(s) FORCE
+#		$(if_changed,ld/objcopy)
+#
+#	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_$@) \
+	       $(filter-out FORCE,$^) -o $@ 
+
+# Objcopy
+# ---------------------------------------------------------------------------
+
+quiet_cmd_objcopy = OBJCPY $(echo_target)
+cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
+
+# Gzip
+# ---------------------------------------------------------------------------
+
+quiet_cmd_gzip = GZIP   $(echo_target)
+cmd_gzip = gzip -f -9 < $< > $@
+
 # ===========================================================================
 # Generic stuff
 # ===========================================================================
@@ -523,4 +555,4 @@
 
 # If quiet is set, only print short version of command
 
-cmd = @$(if $($(quiet)$(1)),echo '  $($(quiet)$(1))' &&) $($(1))
+cmd = @$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))' &&) $(cmd_$(1))

[LV-k25-commit] CVS: kernel-2.5/drivers/input/joystick iforce.c,1.1.1.2,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/input/joystick
In directory sc8-pr-cvs1:/tmp/cvs-serv10034/drivers/input/joystick

Removed Files:
	iforce.c 
Log Message:
Merge with 2.5.25


--- iforce.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/acorn/char defkeymap-acorn.c,1.1.1.1,NONE

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

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

Removed Files:
	defkeymap-acorn.c 
Log Message:
Merge with 2.5.25


--- defkeymap-acorn.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.14,1.15

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.25


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile	27 Jan 2003 01:28:21 -0000	1.14
+++ Makefile	29 Jan 2003 00:07:48 -0000	1.15
@@ -220,8 +220,20 @@
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
 	$(obj)/conmakehash $< > $@
 
-$(obj)/defkeymap.c: $(src)/defkeymap.map
-	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+$(obj)/defkeymap.o:  $(obj)/defkeymap.c
 
-$(obj)/qtronixmap.c: $(src)/qtronixmap.map
-	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+$(obj)/qtronixmap.o: $(obj)/qtronixmap.c
+
+# Uncomment if you're changing the keymap and have an appropriate
+# loadkeys version for the map. By default, we'll use the shipped
+# versions.
+# GENERATE_KEYMAP := 1
+
+ifdef GENERATE_KEYMAP
+
+$(obj)/defkeymap.c $(obj)/qtronixmap.c: $(obj)/%.c: $(src)/%.map
+	loadkeys --mktable $< > $@.tmp
+	sed -e 's/^static *//' $@.tmp > $@
+	rm $@.tmp
+
+endif
\ No newline at end of file

[LV-k25-commit] CVS: kernel-2.5/drivers/input/gameport pcigame.c,1.1.1.2,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/input/gameport
In directory sc8-pr-cvs1:/tmp/cvs-serv10034/drivers/input/gameport

Removed Files:
	pcigame.c 
Log Message:
Merge with 2.5.25


--- pcigame.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/vax/boot Makefile,1.4,1.5

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

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

Modified Files:
	Makefile 
Log Message:
Define EXTRA_TARGETS so that Rules.make knows to read the saved 
command line for head.o


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	23 Jan 2003 23:06:12 -0000	1.4
+++ Makefile	29 Jan 2003 00:06:49 -0000	1.5
@@ -10,4 +10,6 @@
 L_TARGET := libboot.a
 obj-y   := startup.o lib.o hexdump.o mmstart.o cpu_sel.o
 
+EXTRA_TARGETS = head.o
+
 include $(TOPDIR)/Rules.make

[LV-k25-commit] CVS: kernel-2.5/arch/vax vmlinux.lds,1.5,1.6

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

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

Modified Files:
	vmlinux.lds 
Log Message:
Clarify a comment


Index: vmlinux.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/vmlinux.lds,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vmlinux.lds	31 Dec 2002 22:33:07 -0000	1.5
+++ vmlinux.lds	29 Jan 2003 00:04:15 -0000	1.6
@@ -5,7 +5,7 @@
 
 /* As of 2.5.16, the jiffy counter is 64-bit and is called jiffies_64.
    For backward-compatibility, a symbol 'jiffies' needs to be aliased
-   to the low 32-bits of jiffies_64 */
+   to the least-significant 32-bits of jiffies_64 */
 
 jiffies = jiffies_64;
 

[LV-k25-commit] CVS: kernel-2.5/drivers/scsi scsi_merge.c,1.7,1.8 i60uscsi.h,1.1.1.1,NONE

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

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

Modified Files:
	scsi_merge.c 
Removed Files:
	i60uscsi.h 
Log Message:
Merge with 2.5.25


Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scsi_merge.c	25 Jan 2003 00:33:32 -0000	1.7
+++ scsi_merge.c	29 Jan 2003 00:03:39 -0000	1.8
@@ -57,7 +57,7 @@
  */
 int scsi_init_io(Scsi_Cmnd *SCpnt)
 {
-	struct request     *req = &SCpnt->request;
+	struct request     *req = SCpnt->request;
 	struct scatterlist *sgpnt;
 	int count, gfp_mask;
 
@@ -74,8 +74,10 @@
 	SCpnt->use_sg = count;
 
 	gfp_mask = GFP_NOIO;
-	if (in_interrupt())
+	if (in_interrupt()) {
 		gfp_mask &= ~__GFP_WAIT;
+		gfp_mask |= __GFP_HIGH;
+	}
 
 	/*
 	 * if sg table allocation fails, requeue request later.

--- i60uscsi.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/fs/devpts devpts_i.h,1.1.1.1,NONE root.c,1.1.1.4,NONE

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

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

Removed Files:
	devpts_i.h root.c 
Log Message:
Merge with 2.5.25


--- devpts_i.h DELETED ---

--- root.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel syscall.c,1.4,1.5

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

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

Modified Files:
	syscall.c 
Log Message:
sys_pause() is now implemented in arch-independent code


Index: syscall.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/syscall.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- syscall.c	20 May 2002 00:33:33 -0000	1.4
+++ syscall.c	27 Jan 2003 09:04:25 -0000	1.5
@@ -124,17 +124,6 @@
 }
 
 
-/*
- * The syscall handlers from here on down are pretty much copied
- * directly from other arches. Don't know whether they'll work or not...
- */
-int sys_pause(void)
-{
-        current->state = TASK_INTERRUPTIBLE;
-        schedule();
-        return -ERESTARTNOHAND;
-}
-
 int sys_pipe(unsigned long *fildes)
 {
         int fd[2];

[LV-k25-commit] CVS: kernel-2.5/net/802/transit Makefile,1.1.1.1,NONE pdutr.h,1.1.1.1,NONE timertr.h,1.1.1.1,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/net/802/transit
In directory sc8-pr-cvs1:/tmp/cvs-serv753/net/802/transit

Removed Files:
	Makefile pdutr.h timertr.h 
Log Message:
Merge with 2.5.24


--- Makefile DELETED ---

--- pdutr.h DELETED ---

--- timertr.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.8,1.9 53c8xx_d.h,1.1.1.1,NONE 53c8xx_u.h,1.1.1.1,NONE sim710_d.h,1.1.1.1,NONE sim710_u.h,1.1.1.1,NONE

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

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

Modified Files:
	Makefile 
Removed Files:
	53c8xx_d.h 53c8xx_u.h sim710_d.h sim710_u.h 
Log Message:
Merge with 2.5.24


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile	25 Jan 2003 00:33:32 -0000	1.8
+++ Makefile	27 Jan 2003 01:28:21 -0000	1.9
@@ -137,42 +137,32 @@
 
 include $(TOPDIR)/Rules.make
 
-53c8xx_d.h: 53c7,8xx.scr script_asm.pl
-	ln -sf 53c7,8xx.scr fake8.c
-	$(CPP) $(CPPFLAGS) -traditional -DCHIP=810 fake8.c | grep -v '^#' | $(PERL) script_asm.pl 
-	mv script.h 53c8xx_d.h
-	mv scriptu.h 53c8xx_u.h
-	rm fake8.c
+$(obj)/53c7,8xx.o: $(obj)/53c8xx_d.h $(obj)/53c8xx_u.h
+$(obj)/53c7xx.o:   $(obj)/53c7xx_d.h $(obj)/53c7xx_u.h
+$(obj)/sim710.o:   $(obj)/sim710_d.h
+$(obj)/53c700.o $(MODVERDIR)/53c700.ver: $(obj)/53c700_d.h
 
-53c8xx_u.h: 53c8xx_d.h
+# If you want to play with the firmware, uncomment
+# GENERATE_FIRMWARE := 1
 
-53c7,8xx.o: 53c8xx_u.h
+ifdef GENERATE_FIRMWARE
 
-53c7xx_d.h: 53c7xx.scr script_asm.pl
-	ln -sf 53c7xx.scr fake7.c
-	$(CPP) $(CPPFLAGS) -traditional -DCHIP=710 fake7.c | grep -v '^#' | $(PERL) -s script_asm.pl -ncr7x0_family
-	mv script.h 53c7xx_d.h
-	mv scriptu.h 53c7xx_u.h
-	rm fake7.c
+$(obj)/53c8xx_d.h: $(src)/53c7,8xx.scr $(src)/script_asm.pl
+	$(CPP) -traditional -DCHIP=810 - < $< | grep -v '^#' | $(PERL) $(src)/script_asm.pl $@ $(@:_d.h=_u.h)
 
-53c7xx_u.h: 53c7xx_d.h
+$(obj)/53c8xx_u.h: $(obj)/53c8xx_d.h
 
-53c7xx.o : 53c7xx_d.h
+$(obj)/53c7xx_d.h: $(src)/53c7xx.scr $(src)/script_asm.pl
+	$(CPP) -traditional -DCHIP=710 - < $< | grep -v '^#' | $(PERL) -s $(src)/script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h)
 
-sim710_d.h: sim710.scr script_asm.pl
-	ln -sf sim710.scr fake7.c
-	$(CPP) $(CPPFLAGS) -traditional -DCHIP=710 fake7.c | grep -v '^#' | $(PERL) -s script_asm.pl -ncr7x0_family
-	mv script.h sim710_d.h
-	mv scriptu.h sim710_u.h
-	rm fake7.c
+$(obj)/53c7xx_u.h: $(obj)/53c7xx_d.h
 
-sim710_u.h: sim710_d.h
+$(obj)/sim710_d.h: $(src)/sim710.scr $(src)/script_asm.pl
+	$(CPP) -traditional -DCHIP=710 - < $< | grep -v '^#' | $(PERL) -s $(src)/script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h)
 
-sim710.o : sim710_d.h
+$(obj)/sim710_u.h: $(obj)/sim710_d.h
 
-53c700_d.h: 53c700.scr script_asm.pl
-	$(PERL) -s script_asm.pl -ncr7x0_family < 53c700.scr
-	rm -f scriptu.h
-	mv script.h 53c700_d.h
+$(obj)/53c700_d.h: $(src)/53c700.scr $(src)/script_asm.pl
+	$(PERL) -s $(src)/script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h) < $<
 
-53c700.o: 53c700_d.h
+endif
\ No newline at end of file

--- 53c8xx_d.h DELETED ---

--- 53c8xx_u.h DELETED ---

--- sim710_d.h DELETED ---

--- sim710_u.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.24


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	25 Jan 2003 00:33:31 -0000	1.10
+++ Makefile	27 Jan 2003 01:28:21 -0000	1.11
@@ -39,7 +39,7 @@
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BLUEZ)		+= bluetooth/
 obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
-obj-$(CONFIG_ISDN)		+= isdn/
+obj-$(CONFIG_ISDN_BOOL)		+= isdn/
 
 # VAX-specific stuff
 obj-$(CONFIG_VAX)		+= vax/

[LV-k25-commit] CVS: kernel-2.5/sound/pci/rme9652 rme9652_mem.c,1.1.1.2,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/sound/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv753/sound/pci/rme9652

Removed Files:
	rme9652_mem.c 
Log Message:
Merge with 2.5.24


--- rme9652_mem.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/scsi/aic7xxx shipped_aic7xxx_reg.h,1.1.1.1,NONE shipped_aic7xxx_seq.h,1.1.1.1,NONE

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

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

Removed Files:
	shipped_aic7xxx_reg.h shipped_aic7xxx_seq.h 
Log Message:
Merge with 2.5.24


--- shipped_aic7xxx_reg.h DELETED ---

--- shipped_aic7xxx_seq.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/net/802/pseudo Makefile,1.1.1.1,NONE actionnm.h,1.1.1.1,NONE pseudocode.h,1.1.1.1,NONE

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

Update of /cvsroot/linux-vax/kernel-2.5/net/802/pseudo
In directory sc8-pr-cvs1:/tmp/cvs-serv753/net/802/pseudo

Removed Files:
	Makefile actionnm.h pseudocode.h 
Log Message:
Merge with 2.5.24


--- Makefile DELETED ---

--- actionnm.h DELETED ---

--- pseudocode.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.13,1.14 defkeymap.c,1.1.1.1,NONE

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

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

Modified Files:
	Makefile 
Removed Files:
	defkeymap.c 
Log Message:
Merge with 2.5.24


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	25 Jan 2003 00:33:32 -0000	1.13
+++ Makefile	27 Jan 2003 01:28:21 -0000	1.14
@@ -217,13 +217,11 @@
 
 include $(TOPDIR)/Rules.make
 
-consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
-	./conmakehash $< > $@
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
+	$(obj)/conmakehash $< > $@
 
-.DELETE_ON_ERROR:
-
-defkeymap.c: defkeymap.map
+$(obj)/defkeymap.c: $(src)/defkeymap.map
 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
 
-qtronixmap.c: qtronixmap.map
+$(obj)/qtronixmap.c: $(src)/qtronixmap.map
 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@

--- defkeymap.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.29,1.30 Rules.make,1.15,1.16

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

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

Modified Files:
	Makefile Rules.make 
Log Message:
Merge with 2.5.24


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile	26 Jan 2003 23:20:56 -0000	1.29
+++ Makefile	27 Jan 2003 01:28:21 -0000	1.30
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 23
+SUBLEVEL = 24
 EXTRAVERSION =
 
 # We are using a recursive build, so we need to do a little thinking
@@ -48,11 +48,35 @@
   KBUILD_VERBOSE = 1
 endif
 
-# 	Decide whether to build built-in, modular, or both
+# 	Decide whether to build built-in, modular, or both.
+#	Normally, just do built-in.
 
-KBUILD_MODULES := 1
+KBUILD_MODULES :=
 KBUILD_BUILTIN := 1
 
+#	If we have only "make modules", don't compile built-in objects.
+
+ifeq ($(MAKECMDGOALS),modules)
+  KBUILD_BUILTIN :=
+endif
+
+#	If we have "make <whatever> modules", compile modules
+#	in addition to whatever we do anyway.
+
+ifneq ($(filter modules,$(MAKECMDGOALS)),)
+  KBUILD_MODULES := 1
+endif
+
+#	Just "make" or "make all" shall build modules as well
+
+ifeq ($(MAKECMDGOALS),)
+  KBUILD_MODULES := 1
+endif
+
+ifneq ($(filter all,$(MAKECMDGOALS)),)
+  KBUILD_MODULES := 1
+endif
+
 export KBUILD_MODULES KBUILD_BUILTIN
 
 # Beautify output
@@ -120,6 +144,8 @@
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
 export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
 
+SUBDIRS		:= init kernel mm fs ipc lib drivers sound net
+
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
 		    defconfig allyesconfig allnoconfig allmodconfig \
 		    clean mrproper distclean \
@@ -182,7 +208,7 @@
 
 # Link components for vmlinux
 # ---------------------------------------------------------------------------
-SUBDIRS		:= init kernel mm fs ipc lib drivers sound net
+
 INIT		:= init/init.o
 CORE_FILES	:= kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
 LIBS		:= lib/lib.a
@@ -254,6 +280,7 @@
 
 .PHONY: prepare
 prepare: include/linux/version.h include/asm include/config/MARKER
+	@echo '  Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
 
 # Single targets
 # ---------------------------------------------------------------------------
@@ -354,7 +381,7 @@
 	@( echo "#ifndef _LINUX_MODVERSIONS_H";\
 	   echo "#define _LINUX_MODVERSIONS_H"; \
 	   echo "#include <linux/modsetver.h>"; \
-	   for f in `cd .tmp_export-objs; find modules -name \*.ver -print | sort`; do \
+	   for f in `cd .tmp_export-objs; find modules -name SCCS -prune -o -name BitKeeper -prune -o -name \*.ver -print | sort`; do \
 	     echo "#include <linux/$${f}>"; \
 	   done; \
 	   echo "#endif"; \
@@ -384,8 +411,7 @@
 endif
 
 .PHONY: modules
-modules:
-	@$(MAKE) KBUILD_BUILTIN= $(SUBDIRS)
+modules: $(SUBDIRS)
 
 #	Install modules
 
@@ -466,7 +492,9 @@
 #	   will become invalid
 
 rpm:	clean spec
-	find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
+	find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -size 0 -o -name .depend -o -name .hdepend \) \
+		-type f -print | xargs rm -f
 	set -e; \
 	cd $(TOPDIR)/.. ; \
 	ln -sf $(TOPDIR) $(KERNELPATH) ; \
@@ -549,6 +577,7 @@
 	drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
 	drivers/char/conmakehash \
 	drivers/char/drm/*-mod.c \
+	drivers/char/defkeymap.c drivers/char/qtronixmap.c \
 	drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
 	drivers/zorro/devlist.h drivers/zorro/gen-devlist \
 	sound/oss/bin2hex sound/oss/hex2hex \
@@ -559,9 +588,12 @@
 	drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
 	drivers/scsi/aic7xxx/aicasm/y.tab.h \
 	drivers/scsi/aic7xxx/aicasm/aicasm \
-	drivers/scsi/53c700_d.h \
-	net/khttpd/make_times_h \
-	net/khttpd/times.h \
+	drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
+	drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
+	drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
+	net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
+	net/802/pseudo/pseudocode.h \
+	net/khttpd/make_times_h net/khttpd/times.h \
 	submenu*
 
 # 	files removed with 'make mrproper'
@@ -599,23 +631,26 @@
 
 clean:	archclean
 	@echo 'Cleaning up'
-	@find . \( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
-		   -name .\*.tmp -o -name .\*.d \) -type f -print \
+	@find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
+		-name .\*.tmp -o -name .\*.d \) -type f -print \
 		| grep -v lxdialog/ | xargs rm -f
 	@rm -f $(CLEAN_FILES)
 	@$(MAKE) -C Documentation/DocBook clean
 
 mrproper: clean archmrproper
 	@echo 'Making mrproper'
-	@find . \( -size 0 -o -name .depend -o -name .\*.cmd \) \
-		   -type f -print | xargs rm -f
+	@find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -name .depend -o -name .\*.cmd \) \
+		-type f -print | xargs rm -f
 	@rm -f $(MRPROPER_FILES)
 	@rm -rf $(MRPROPER_DIRS)
 	@$(MAKE) -C Documentation/DocBook mrproper
 
 distclean: mrproper
 	@echo 'Making distclean'
-	@find . \( -not -type d \) -and \
+	@find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -not -type d \) -and \
 	 	\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 	 	-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f \
@@ -625,16 +660,24 @@
 # ---------------------------------------------------------------------------
 
 TAGS: FORCE
-	{ find include/asm-${ARCH} -name '*.h' -print ; \
-	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
-	find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
+	{ find include/asm-${ARCH} -name SCCS -prune -o -name BitKeeper -prune \
+		-o -name '*.h' -print ; \
+	find include -name SCCS -prune -o -name BitKeeper -prune -o \
+		-type d \( -name "asm-*" -o -name config \) -prune -o \
+		-name '*.h' -print ; \
+	find $(SUBDIRS) init arch/${ARCH} \
+		-name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[chS]' -print ; } | grep -v SCCS | etags -
 
 # 	Exuberant ctags works better with -I
 tags: FORCE
 	CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
-	ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
-	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
-	find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
+	ctags $$CTAGSF `find include/asm-$(ARCH) -name SCCS -prune -o -name BitKeeper -prune -o -name '*.h' -print` && \
+	find include -name SCCS -prune -o -name BitKeeper -prune -o \
+		-type d \( -name "asm-*" -o -name config \) -prune -o \
+		-name '*.h' -print | xargs ctags $$CTAGSF -a && \
+	find $(SUBDIRS) init -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[ch]' -print | xargs ctags $$CTAGSF -a
 
 # Documentation targets
 # ---------------------------------------------------------------------------
@@ -647,13 +690,19 @@
 # ---------------------------------------------------------------------------
 
 checkconfig:
-	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
+	find * -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[hcS]' -type f -print | sort \
+		| xargs $(PERL) -w scripts/checkconfig.pl
 
 checkhelp:
-	find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl
+	find * -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name [cC]onfig.in -print | sort \
+		| xargs $(PERL) -w scripts/checkhelp.pl
 
 checkincludes:
-	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
+	find * -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[hcS]' -type f -print | sort \
+		| xargs $(PERL) -w scripts/checkincludes.pl
 
 else # ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
 

Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Rules.make	26 Jan 2003 23:20:56 -0000	1.15
+++ Rules.make	27 Jan 2003 01:28:21 -0000	1.16
@@ -22,6 +22,30 @@
   TOPDIR_REL := $(subst $(space),,$(foreach d,$(subst /, ,$(RELDIR)),../))
 endif
 
+# Some paths for the Makefiles to use
+# ---------------------------------------------------------------------------
+
+# 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
+#
+# Those 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
+
+obj := .
+src := .
+objtree := $(TOPDIR)
+srctree := $(TOPDIR)
+
 # Figure out what we need to build from the various variables
 # ===========================================================================
 
@@ -384,6 +408,13 @@
 
 endif # ! modules_install
 endif # ! fastdep
+
+# Shipped files
+# ===========================================================================
+
+%:: %_shipped
+	@echo '  CP     $(RELDIR)/$@'
+	@cp $< $@
 
 # ===========================================================================
 # Generic stuff

[LV-k25-commit] CVS: kernel-2.5/net/802 cl2llc.c,1.1.1.1,NONE

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

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

Removed Files:
	cl2llc.c 
Log Message:
Merge with 2.5.24


--- cl2llc.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax cacheflush.h,1.1,1.2

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

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

Modified Files:
	cacheflush.h 
Log Message:
<asm-i386/cacheflush.h> includes <linux/mm.h>.  We don't need it, but
some core files which include <asm/cacheflush.h> and don't include
<linux/mm.h> directory, refer to page_address().  So include <linux/mm.h>
too, just to keep them happy.


Index: cacheflush.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/cacheflush.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacheflush.h	12 Dec 2002 01:19:20 -0000	1.1
+++ cacheflush.h	27 Jan 2003 00:23:45 -0000	1.2
@@ -1,6 +1,8 @@
 #ifndef __VAX_CACHEFLUSH_H 
 #define __VAX_CACHEFLUSH_H
 
+#include <linux/mm.h>
+
 /* 
  * cacheflush.h.  Definitions for cache structures/routines.
  * Copyright atp Jan 2001 

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax siginfo.h,1.5,1.6

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

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

Modified Files:
	siginfo.h 
Log Message:
Use generic siginfo.h


Index: siginfo.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/siginfo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- siginfo.h	4 Dec 2002 10:36:21 -0000	1.5
+++ siginfo.h	27 Jan 2003 00:22:02 -0000	1.6
@@ -1,237 +1 @@
-#ifndef __VAX_SIGINFO_H
-#define __VAX_SIGINFO_H
-
-/* atp jan 2001 - taken from i386 from alpha */
-
-#include <linux/types.h>
-
-/* XXX: This structure was copied from the Alpha; is there an iBCS version?  */
-
-typedef union sigval {
-	int sival_int;
-	void *sival_ptr;
-} sigval_t;
-
-#define SI_MAX_SIZE	128
-#define SI_PAD_SIZE	((SI_MAX_SIZE/sizeof(int)) - 3)
-
-typedef struct siginfo {
-	int si_signo;
-	int si_errno;
-	int si_code;
-
-	union {
-		int _pad[SI_PAD_SIZE];
-
-		/* kill() */
-		struct {
-			pid_t _pid;		/* sender's pid */
-			uid_t _uid;		/* sender's uid */
-		} _kill;
-
-		/* POSIX.1b timers */
-		struct {
-			unsigned int _timer1;
-			unsigned int _timer2;
-		} _timer;
-
-		/* POSIX.1b signals */
-		struct {
-			pid_t _pid;		/* sender's pid */
-			uid_t _uid;		/* sender's uid */
-			sigval_t _sigval;
-		} _rt;
-
-		/* SIGCHLD */
-		struct {
-			pid_t _pid;		/* which child */
-			uid_t _uid;		/* sender's uid */
-			int _status;		/* exit code */
-			clock_t _utime;
-			clock_t _stime;
-		} _sigchld;
-
-		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-		struct {
-			void *_addr; /* faulting insn/memory ref. */
-		} _sigfault;
-
-		/* SIGPOLL */
-		struct {
-			int _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
-			int _fd;
-		} _sigpoll;
-	} _sifields;
-} siginfo_t;
-
-/*
- * How these fields are to be accessed.
- */
-#define si_pid		_sifields._kill._pid
-#define si_uid		_sifields._kill._uid
-#define si_status	_sifields._sigchld._status
-#define si_utime	_sifields._sigchld._utime
-#define si_stime	_sifields._sigchld._stime
-#define si_value	_sifields._rt._sigval
-#define si_int		_sifields._rt._sigval.sival_int
-#define si_ptr		_sifields._rt._sigval.sival_ptr
-#define si_addr		_sifields._sigfault._addr
-#define si_band		_sifields._sigpoll._band
-#define si_fd		_sifields._sigpoll._fd
-
-#ifdef __KERNEL__
-#define __SI_MASK	0xffff0000
-#define __SI_KILL	(0 << 16)
-#define __SI_TIMER	(1 << 16)
-#define __SI_POLL	(2 << 16)
-#define __SI_FAULT	(3 << 16)
-#define __SI_CHLD	(4 << 16)
-#define __SI_RT		(5 << 16)
-#define __SI_CODE(T,N)	((T) << 16 | ((N) & 0xffff))
-#else
-#define __SI_KILL	0
-#define __SI_TIMER	0
-#define __SI_POLL	0
-#define __SI_FAULT	0
-#define __SI_CHLD	0
-#define __SI_RT		0
-#define __SI_CODE(T,N)	(N)
-#endif
-
-/*
- * si_code values
- * Digital reserves positive values for kernel-generated signals.
- */
-#define SI_USER		0		/* sent by kill, sigsend, raise */
-#define SI_KERNEL	0x80		/* sent by the kernel from somewhere */
-#define SI_QUEUE	-1		/* sent by sigqueue */
-#define SI_TIMER __SI_CODE(__SI_TIMER,-2) /* sent by timer expiration */
-#define SI_MESGQ	-3		/* sent by real time mesq state change */
-#define SI_ASYNCIO	-4		/* sent by AIO completion */
-#define SI_SIGIO	-5		/* sent by queued SIGIO */
-#define SI_TKILL	-6		/* sent by tkill system call */
-#define SI_DETHREAD	-7		/* sent by execve() killing subsidiary threads */
-
-#define SI_FROMUSER(siptr)	((siptr)->si_code <= 0)
-#define SI_FROMKERNEL(siptr)	((siptr)->si_code > 0)
-
-/*
- * SIGILL si_codes
- */
-#define ILL_ILLOPC	(__SI_FAULT|1)	/* illegal opcode */
-#define ILL_ILLOPN	(__SI_FAULT|2)	/* illegal operand */
-#define ILL_ILLADR	(__SI_FAULT|3)	/* illegal addressing mode */
-#define ILL_ILLTRP	(__SI_FAULT|4)	/* illegal trap */
-#define ILL_PRVOPC	(__SI_FAULT|5)	/* privileged opcode */
-#define ILL_PRVREG	(__SI_FAULT|6)	/* privileged register */
-#define ILL_COPROC	(__SI_FAULT|7)	/* coprocessor error */
-#define ILL_BADSTK	(__SI_FAULT|8)	/* internal stack error */
-#define NSIGILL		8
-
-/*
- * SIGFPE si_codes
- */
-#define FPE_INTDIV	(__SI_FAULT|1)	/* integer divide by zero */
-#define FPE_INTOVF	(__SI_FAULT|2)	/* integer overflow */
-#define FPE_FLTDIV	(__SI_FAULT|3)	/* floating point divide by zero */
-#define FPE_FLTOVF	(__SI_FAULT|4)	/* floating point overflow */
-#define FPE_FLTUND	(__SI_FAULT|5)	/* floating point underflow */
-#define FPE_FLTRES	(__SI_FAULT|6)	/* floating point inexact result */
-#define FPE_FLTINV	(__SI_FAULT|7)	/* floating point invalid operation */
-#define FPE_FLTSUB	(__SI_FAULT|8)	/* subscript out of range */
-#define NSIGFPE		8
-
-/*
- * SIGSEGV si_codes
- */
-#define SEGV_MAPERR	(__SI_FAULT|1)	/* address not mapped to object */
-#define SEGV_ACCERR	(__SI_FAULT|2)	/* invalid permissions for mapped object */
-#define NSIGSEGV	2
-
-/*
- * SIGBUS si_codes
- */
-#define BUS_ADRALN	(__SI_FAULT|1)	/* invalid address alignment */
-#define BUS_ADRERR	(__SI_FAULT|2)	/* non-existant physical address */
-#define BUS_OBJERR	(__SI_FAULT|3)	/* object specific hardware error */
-#define NSIGBUS		3
-
-/*
- * SIGTRAP si_codes
- */
-#define TRAP_BRKPT	(__SI_FAULT|1)	/* process breakpoint */
-#define TRAP_TRACE	(__SI_FAULT|2)	/* process trace trap */
-#define NSIGTRAP	2
-
-/*
- * SIGCHLD si_codes
- */
-#define CLD_EXITED	(__SI_CHLD|1)	/* child has exited */
-#define CLD_KILLED	(__SI_CHLD|2)	/* child was killed */
-#define CLD_DUMPED	(__SI_CHLD|3)	/* child terminated abnormally */
-#define CLD_TRAPPED	(__SI_CHLD|4)	/* traced child has trapped */
-#define CLD_STOPPED	(__SI_CHLD|5)	/* child has stopped */
-#define CLD_CONTINUED	(__SI_CHLD|6)	/* stopped child has continued */
-#define NSIGCHLD	6
-
-/*
- * SIGPOLL si_codes
- */
-#define POLL_IN		(__SI_POLL|1)	/* data input available */
-#define POLL_OUT	(__SI_POLL|2)	/* output buffers available */
-#define POLL_MSG	(__SI_POLL|3)	/* input message available */
-#define POLL_ERR	(__SI_POLL|4)	/* i/o error */
-#define POLL_PRI	(__SI_POLL|5)	/* high priority input available */
-#define POLL_HUP	(__SI_POLL|6)	/* device disconnected */
-#define NSIGPOLL	6
-
-/*
- * sigevent definitions
- * 
- * It seems likely that SIGEV_THREAD will have to be handled from 
- * userspace, libpthread transmuting it to SIGEV_SIGNAL, which the
- * thread manager then catches and does the appropriate nonsense.
- * However, everything is written out here so as to not get lost.
- */
-#define SIGEV_SIGNAL	0	/* notify via signal */
-#define SIGEV_NONE	1	/* other notification: meaningless */
-#define SIGEV_THREAD	2	/* deliver via thread creation */
-
-#define SIGEV_MAX_SIZE	64
-#define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE/sizeof(int)) - 3)
-
-typedef struct sigevent {
-	sigval_t sigev_value;
-	int sigev_signo;
-	int sigev_notify;
-	union {
-		int _pad[SIGEV_PAD_SIZE];
-
-		struct {
-			void (*_function)(sigval_t);
-			void *_attribute;	/* really pthread_attr_t */
-		} _sigev_thread;
-	} _sigev_un;
-} sigevent_t;
-
-#define sigev_notify_function	_sigev_un._sigev_thread._function
-#define sigev_notify_attributes	_sigev_un._sigev_thread._attribute
-
-#ifdef __KERNEL__
-#include <linux/string.h>
-
-extern inline void copy_siginfo(siginfo_t *to, siginfo_t *from)
-{
-	if (from->si_code < 0)
-		memcpy(to, from, sizeof(siginfo_t));
-	else
-		/* _sigchld is currently the largest know union member */
-		memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
-}
-
-extern int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from);
-
-#endif /* __KERNEL__ */
-
-#endif /* __ASM_VAX_SIGINFO_H */
-
+#include <asm-generic/siginfo.h>