Menu
▾
▴
linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(66) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(17) |
Nov
(1) |
Dec
(220) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(154) |
Feb
(167) |
Mar
(159) |
Apr
(172) |
May
(35) |
Jun
(58) |
Jul
(97) |
Aug
(285) |
Sep
(139) |
Oct
(252) |
Nov
(8) |
Dec
(3) |
| 2004 |
Jan
(13) |
Feb
(159) |
Mar
(136) |
Apr
(33) |
May
(50) |
Jun
(42) |
Jul
(140) |
Aug
(42) |
Sep
(199) |
Oct
(31) |
Nov
(55) |
Dec
|
| 2005 |
Jan
|
Feb
(12) |
Mar
(214) |
Apr
(119) |
May
(21) |
Jun
(2) |
Jul
(127) |
Aug
(10) |
Sep
(3) |
Oct
(24) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(26) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acorn In directory sc8-pr-cvs1:/tmp/cvs-serv1632/drivers/acorn Removed Files: Makefile Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- Makefile DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv1632/drivers/char Modified Files: Makefile Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 12 Jan 2003 22:52:53 -0000 1.10 +++ Makefile 14 Jan 2003 23:55:17 -0000 1.11 @@ -155,6 +155,7 @@ obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o +obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o obj-$(CONFIG_SERIAL_IPR) += generic_serial.o obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:22
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/ppc64/kernel In directory sc8-pr-cvs1:/tmp/cvs-serv1632/arch/ppc64/kernel Removed Files: ppc-stub.c Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- ppc-stub.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi In directory sc8-pr-cvs1:/tmp/cvs-serv1632/drivers/acpi Removed Files: acpi_ac.c acpi_battery.c acpi_bus.c acpi_button.c acpi_ec.c acpi_fan.c acpi_osl.c acpi_pci_link.c acpi_pci_root.c acpi_power.c acpi_processor.c acpi_system.c acpi_tables.c acpi_thermal.c acpi_utils.c Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- acpi_ac.c DELETED --- --- acpi_battery.c DELETED --- --- acpi_bus.c DELETED --- --- acpi_button.c DELETED --- --- acpi_ec.c DELETED --- --- acpi_fan.c DELETED --- --- acpi_osl.c DELETED --- --- acpi_pci_link.c DELETED --- --- acpi_pci_root.c DELETED --- --- acpi_power.c DELETED --- --- acpi_processor.c DELETED --- --- acpi_system.c DELETED --- --- acpi_tables.c DELETED --- --- acpi_thermal.c DELETED --- --- acpi_utils.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:22
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-arm/proc-armv In directory sc8-pr-cvs1:/tmp/cvs-serv1632/include/asm-arm/proc-armv Removed Files: uncompress.h Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- uncompress.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:21
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/base
In directory sc8-pr-cvs1:/tmp/cvs-serv1632/drivers/base
Modified Files:
bus.c
Log Message:
Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to
2.5.19 that I missed earlier.
Index: bus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/base/bus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bus.c 12 Jan 2003 22:46:40 -0000 1.2
+++ bus.c 14 Jan 2003 23:55:17 -0000 1.3
@@ -24,6 +24,91 @@
};
/**
+ * bus_for_each_dev - walk list of devices and do something to each
+ * @bus: bus in question
+ * @data: data for the callback
+ * @callback: caller-defined action to perform on each device
+ *
+ * Why do we do this? So we can guarantee proper locking and reference
+ * counting on devices as we touch each one.
+ *
+ * Algorithm:
+ * Take the bus lock and get the first node in the list. We increment
+ * the reference count and unlock the bus. If we have a device from a
+ * previous iteration, we decrement the reference count.
+ * After we call the callback, we get the next node in the list and loop.
+ * At the end, if @dev is not null, we still have it pinned, so we need
+ * to let it go.
+ */
+int bus_for_each_dev(struct bus_type * bus, void * data,
+ int (*callback)(struct device * dev, void * data))
+{
+ struct device * next;
+ struct device * dev = NULL;
+ struct list_head * node;
+ int error = 0;
+
+ get_bus(bus);
+ read_lock(&bus->lock);
+ node = bus->devices.next;
+ while (node != &bus->devices) {
+ next = list_entry(node,struct device,bus_list);
+ get_device(next);
+ read_unlock(&bus->lock);
+
+ if (dev)
+ put_device(dev);
+ dev = next;
+ if ((error = callback(dev,data))) {
+ put_device(dev);
+ break;
+ }
+ read_lock(&bus->lock);
+ node = dev->bus_list.next;
+ }
+ read_unlock(&bus->lock);
+ if (dev)
+ put_device(dev);
+ put_bus(bus);
+ return error;
+}
+
+int bus_for_each_drv(struct bus_type * bus, void * data,
+ int (*callback)(struct device_driver * drv, void * data))
+{
+ struct device_driver * next;
+ struct device_driver * drv = NULL;
+ struct list_head * node;
+ int error = 0;
+
+ /* pin bus in memory */
+ get_bus(bus);
+
+ read_lock(&bus->lock);
+ node = bus->drivers.next;
+ while (node != &bus->drivers) {
+ next = list_entry(node,struct device_driver,bus_list);
+ get_driver(next);
+ read_unlock(&bus->lock);
+
+ if (drv)
+ put_driver(drv);
+ drv = next;
+ if ((error = callback(drv,data))) {
+ put_driver(drv);
+ break;
+ }
+ read_lock(&bus->lock);
+ node = drv->bus_list.next;
+ }
+ read_unlock(&bus->lock);
+ if (drv)
+ put_driver(drv);
+ put_bus(bus);
+ return error;
+}
+
+/**
* bus_add_device - add device to bus
* @dev: device being added
*
@@ -120,6 +205,8 @@
core_initcall(bus_init);
+EXPORT_SYMBOL(bus_for_each_dev);
+EXPORT_SYMBOL(bus_for_each_drv);
EXPORT_SYMBOL(bus_add_device);
EXPORT_SYMBOL(bus_remove_device);
EXPORT_SYMBOL(bus_register);
|
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:21
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/cdrom In directory sc8-pr-cvs1:/tmp/cvs-serv1632/drivers/cdrom Removed Files: sbpcd2.c sbpcd3.c sbpcd4.c Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- sbpcd2.c DELETED --- --- sbpcd3.c DELETED --- --- sbpcd4.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:20
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/mach-sa1100 In directory sc8-pr-cvs1:/tmp/cvs-serv1632/arch/arm/mach-sa1100 Removed Files: victor.c Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- victor.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:20
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/def-configs In directory sc8-pr-cvs1:/tmp/cvs-serv1632/arch/arm/def-configs Removed Files: victor Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. --- victor DELETED --- |
|
From: Kenn H. <ke...@us...> - 2003-01-14 23:55:20
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1:/tmp/cvs-serv1632 Modified Files: Makefile Rules.make Log Message: Merge with 2.5.20. Also catch up on some file deletions in 2.5.17 to 2.5.19 that I missed earlier. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile 12 Jan 2003 22:52:52 -0000 1.23 +++ Makefile 14 Jan 2003 23:55:17 -0000 1.24 @@ -1,8 +1,24 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 19 +SUBLEVEL = 20 EXTRAVERSION = +# We are using a recursive build, so we need to do a little thinking +# to get the ordering right. +# +# Most importantly: sub-Makefiles should only ever modify files in +# their own directory. If in some directory we have a dependency on +# a file in another dir (which doesn't happen often, but it's of +# unavoidable when linking the built-in.o targets which finally +# turn into vmlinux), we will call a sub make in that other dir, and +# after that we are sure that everything which is in that other dir +# is now up to date. +# +# The only cases where we need to modify files which have global +# effects are thus separated out and done before the recursive +# descending is started. They are now explicitly listed as the +# prepare rule. + KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) ARCH=vax @@ -62,13 +78,8 @@ ifeq (.config,$(wildcard .config)) include .config -ifeq (.hdepend,$(wildcard .hdepend)) do-it-all: vmlinux else -CONFIGURATION = depend -do-it-all: depend -endif -else CONFIGURATION = config do-it-all: config endif @@ -172,9 +183,16 @@ # Handle descending into subdirectories listed in $(SUBDIRS) .PHONY: $(SUBDIRS) -$(SUBDIRS): FORCE include/linux/version.h include/config/MARKER +$(SUBDIRS): prepare @$(MAKE) -C $@ +# Things we need done before we even start the actual build. +# The dependency on .hdepend will in turn take care of +# include/asm, include/linux/version etc. + +.PHONY: prepare +prepare: .hdepend include/config/MARKER + # Single targets # --------------------------------------------------------------------------- @@ -189,69 +207,70 @@ %.o: %.S FORCE @$(MAKE) -C $(@D) $(@F) -# Configuration -# --------------------------------------------------------------------------- - -oldconfig: symlinks - $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in +# FIXME: The asm symlink changes when $(ARCH) changes. That's +# hard to detect, but I suppose "make mrproper" is a good idea +# before switching between archs anyway. + +include/asm: + @echo 'Making asm->asm-$(ARCH) symlink' + @ln -s asm-$(ARCH) $@ + @echo 'Making directory include/linux/modules' + @mkdir include/linux/modules -xconfig: symlinks - @$(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk - -menuconfig: include/linux/version.h symlinks - @$(MAKE) -C scripts/lxdialog all - $(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in - -config: symlinks - $(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in - -# make asm->asm-$(ARCH) symlink - -symlinks: - rm -f include/asm - ( cd include ; ln -sf asm-$(ARCH) asm) - @if [ ! -d include/linux/modules ]; then \ - mkdir include/linux/modules; \ - fi - -# split autoconf.h into include/linux/config/* +# Split autoconf.h into include/linux/config/* include/config/MARKER: scripts/split-include include/linux/autoconf.h scripts/split-include include/linux/autoconf.h include/config @ touch include/config/MARKER # Generate some files +# --------------------------------------------------------------------------- -$(TOPDIR)/include/linux/version.h: include/linux/version.h +# version.h changes when $(KERNELRELEASE) etc change, as defined in +# this Makefile -include/linux/version.h: ./Makefile +include/linux/version.h: Makefile @echo Generating $@ @. scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL) -# helpers built in scripts/ +# Helpers built in scripts/ +# --------------------------------------------------------------------------- scripts/mkdep scripts/split-include : FORCE @$(MAKE) -C scripts -# --------------------------------------------------------------------------- # Generate dependencies +# --------------------------------------------------------------------------- -depend dep: dep-files +# In the same pass, generate module versions, that's why it's +# all mixed up here. -dep-files: scripts/mkdep archdep include/linux/version.h - scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend +.PHONY: depend dep $(patsubst %,_sfdep_%,$(SUBDIRS)) + +depend dep: .hdepend + +# .hdepend is missing prerequisites - in fact dependencies need +# to be redone basically each time anything changed - since +# that's too expensive, we traditionally rely on the user to +# run "make dep" manually whenever necessary. In this case, +# we make "FORCE" a prequisite, to force redoing the +# dependencies. Yeah, that's ugly, and it'll go away soon. + +.hdepend: scripts/mkdep include/linux/version.h include/asm \ + $(if $(filter dep depend,$(MAKECMDGOALS)),FORCE) + scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > $@ @$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) ifdef CONFIG_MODVERSIONS - $(MAKE) update-modverfile + @$(MAKE) include/linux/modversions.h endif + @$(MAKE) archdep -.PHONY: $(patsubst %,_sfdep_%,$(SUBDIRS)) $(patsubst %,_sfdep_%,$(SUBDIRS)): FORCE @$(MAKE) -C $(patsubst _sfdep_%, %, $@) fastdep -# update modversions.h, but only if it would change -update-modverfile: +# Update modversions.h, but only if it would change. + +include/linux/modversions.h: FORCE @(echo "#ifndef _LINUX_MODVERSIONS_H";\ echo "#define _LINUX_MODVERSIONS_H"; \ echo "#include <linux/modsetver.h>"; \ @@ -260,13 +279,13 @@ if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \ done; \ echo "#endif"; \ - ) > $(TOPDIR)/include/linux/modversions.h.tmp - @if [ -r $(TOPDIR)/include/linux/modversions.h ] && cmp -s $(TOPDIR)/include/linux/modversions.h $(TOPDIR)/include/linux/modversions.h.tmp; then \ - echo $(TOPDIR)/include/linux/modversions.h was not updated; \ - rm -f $(TOPDIR)/include/linux/modversions.h.tmp; \ + ) > $@.tmp + @if [ -r $@ ] && cmp -s $@ $@.tmp; then \ + echo $@ was not updated; \ + rm -f $@.tmp; \ else \ - echo $(TOPDIR)/include/linux/modversions.h was updated; \ - mv -f $(TOPDIR)/include/linux/modversions.h.tmp $(TOPDIR)/include/linux/modversions.h; \ + echo $@ was updated; \ + mv -f $@.tmp $@; \ fi # --------------------------------------------------------------------------- @@ -277,7 +296,7 @@ # Build modules ifdef CONFIG_MODVERSIONS -MODFLAGS += -DMODVERSIONS -include $(HPATH)/linux/modversions.h +MODFLAGS += -include $(HPATH)/linux/modversions.h endif .PHONY: modules @@ -332,6 +351,90 @@ endif # CONFIG_MODULES +# Scripts to check various things for consistency +# --------------------------------------------------------------------------- + +checkconfig: + find * -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 + +checkincludes: + find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl + +# Generate tags for editors +# --------------------------------------------------------------------------- + +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 -name '*.[ch]' ; } | 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 + +# Assorted miscellaneous targets +# --------------------------------------------------------------------------- + +# Documentation targets + +sgmldocs psdocs pdfdocs htmldocs: + @$(MAKE) -C Documentation/DocBook $@ + + +# RPM target +# +# If you do a make spec before packing the tarball you can rpm -ta it + +spec: + . scripts/mkspec >kernel.spec + +# Build a tar ball, generate an rpm from it and pack the result +# There arw two bits of magic here +# 1) The use of /. to avoid tar packing just the symlink +# 2) Removing the .dep files as they have source paths in them that +# will become invalid + +rpm: clean spec + find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f + set -e; \ + cd $(TOPDIR)/.. ; \ + ln -sf $(TOPDIR) $(KERNELPATH) ; \ + tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ + rm $(KERNELPATH) ; \ + cd $(TOPDIR) ; \ + . scripts/mkversion > .version ; \ + rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ + rm $(TOPDIR)/../$(KERNELPATH).tar.gz + +# Targets which don't need .config +# =========================================================================== + +# Kernel configuration +# --------------------------------------------------------------------------- + +.PHONY: oldconfig xconfig menuconfig config + +oldconfig: + $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in + +xconfig: + @$(MAKE) -C scripts kconfig.tk + wish -f scripts/kconfig.tk + +menuconfig: + @$(MAKE) -C scripts/lxdialog all + $(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in + +config: + $(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in + + # Cleaning up # --------------------------------------------------------------------------- @@ -409,80 +512,19 @@ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags -# Assorted miscellaneous targets -# --------------------------------------------------------------------------- - -# Documentation targets - -sgmldocs psdocs pdfdocs htmldocs: - @$(MAKE) -C Documentation/DocBook $@ - - -# RPM target -# -# If you do a make spec before packing the tarball you can rpm -ta it - -spec: - . scripts/mkspec >kernel.spec - -# Build a tar ball, generate an rpm from it and pack the result -# There arw two bits of magic here -# 1) The use of /. to avoid tar packing just the symlink -# 2) Removing the .dep files as they have source paths in them that -# will become invalid - -rpm: clean spec - find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f - set -e; \ - cd $(TOPDIR)/.. ; \ - ln -sf $(TOPDIR) $(KERNELPATH) ; \ - tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \ - rm $(KERNELPATH) ; \ - cd $(TOPDIR) ; \ - . scripts/mkversion > .version ; \ - rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ - rm $(TOPDIR)/../$(KERNELPATH).tar.gz - -# Scripts to check various things for consistency - -checkconfig: - find * -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 - -checkincludes: - find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl - -# Generate tags for editors - -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 -name '*.[ch]' ; } | 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 - -# Make a backup -# FIXME anybody still using this? - -backup: mrproper - cd .. && tar cf - linux/ | gzip -9 > backup.gz - sync +# FIXME Should go into a make.lib or something +# =========================================================================== -# Make checksums -# FIXME anybody still using this? +# read all saved command lines -sums: - find . -type f -print | sort | xargs sum > .SUMS +cmd_files := $(wildcard .*.cmd) +ifneq ($(cmd_files),) + include $(cmd_files) +endif -# FIXME Should go into a make.lib or something -# --------------------------------------------------------------------------- +# 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_$(@F)))\ Index: Rules.make =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Rules.make 12 Jan 2003 22:52:52 -0000 1.11 +++ Rules.make 14 Jan 2003 23:55:17 -0000 1.12 @@ -294,9 +294,6 @@ # ifdef CONFIG_MODULES -multi-objs := $(foreach m, $(obj-y) $(obj-m), $($(basename $(m))-objs)) -active-objs := $(sort $(multi-objs) $(obj-y) $(obj-m)) - ifdef CONFIG_MODVERSIONS ifneq "$(strip $(export-objs))" "" @@ -314,38 +311,37 @@ genksyms_smp_prefix := endif -$(MODINCL)/$(MODPREFIX)%.ver: %.c - @if [ ! -r $(MODINCL)/$(MODPREFIX)$*.stamp -o $(MODINCL)/$(MODPREFIX)$*.stamp -ot $< ]; then \ - echo '$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \ - echo '| $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp'; \ - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< \ - | $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp; \ - if [ -r $@ ] && cmp -s $@ $@.tmp; then echo $@ is unchanged; rm -f $@.tmp; \ - else echo mv $@.tmp $@; mv -f $@.tmp $@; fi; \ - fi; touch $(MODINCL)/$(MODPREFIX)$*.stamp +# We don't track dependencies for .ver files, so we FORCE to check +# them always (i.e. always at "make dep" time). + +cmd_create_ver = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< | \ + $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp -$(addprefix $(MODINCL)/$(MODPREFIX),$(export-objs:.o=.ver)): $(TOPDIR)/include/linux/autoconf.h +$(MODINCL)/$(MODPREFIX)%.ver: %.c FORCE + @echo $(cmd_create_ver) + @$(cmd_create_ver) + @if [ -r $@ ] && cmp -s $@ $@.tmp; then \ + echo $@ is unchanged; rm -f $@.tmp; \ + else \ + echo mv $@.tmp $@; mv -f $@.tmp $@; \ + fi # updates .ver files but not modversions.h fastdep: $(addprefix $(MODINCL)/$(MODPREFIX),$(export-objs:.o=.ver)) endif # export-objs -$(active-objs): $(TOPDIR)/include/linux/modversions.h +# make dep cannot correctly figure out the dependency on the generated +# modversions.h, so we list them here: +# o files which export symbols and are compiled into the kernel include +# it (to generate a correct symbol table) +# o all modules get compiled with -include modversions.h -else - -$(TOPDIR)/include/linux/modversions.h: - @echo "#include <linux/modsetver.h>" > $@ +$(filter $(export-objs),$(real-objs-y)): $(TOPDIR)/include/linux/modversions.h +$(real-objs-m): $(TOPDIR)/include/linux/modversions.h endif # CONFIG_MODVERSIONS -ifneq "$(strip $(export-objs))" "" - -$(export-objs): $(TOPDIR)/include/linux/modversions.h - -endif - endif # CONFIG_MODULES # @@ -403,4 +399,3 @@ $(filter-out $($(1)),$(cmd_$(@F)))\ $(filter-out $(cmd_$(@F)),$($(1)))),\ @echo '$($(1))' && $($(1)) && echo 'cmd_$@ := $($(1))' > $(@D)/.$(@F).cmd) - |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:52:57
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/net In directory sc8-pr-cvs1:/tmp/cvs-serv30622/drivers/net Modified Files: Makefile Log Message: Merge with 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile 9 Jan 2003 22:10:45 -0000 1.12 +++ Makefile 12 Jan 2003 22:52:53 -0000 1.13 @@ -1,17 +1,9 @@ -# File: drivers/net/Makefile # # Makefile for the Linux network (ethercard) device drivers. # -obj-y := -obj-m := -obj-n := -obj- := - mod-subdirs := appletalk arcnet fc irda tokenring tulip pcmcia wireless \ wan ../acorn/net - -O_TARGET := net.o # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:52:57
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1:/tmp/cvs-serv30622/drivers/scsi Modified Files: Makefile Log Message: Merge with 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 9 Jan 2003 22:10:46 -0000 1.6 +++ Makefile 12 Jan 2003 22:52:53 -0000 1.7 @@ -18,9 +18,6 @@ CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM - -O_TARGET := scsidrv.o - export-objs := scsi_syms.o 53c700.o mod-subdirs := pcmcia ../acorn/scsi |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:52:57
|
Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv30622
Modified Files:
Makefile Rules.make
Log Message:
Merge with 2.5.19
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile 9 Jan 2003 22:01:10 -0000 1.22
+++ Makefile 12 Jan 2003 22:52:52 -0000 1.23
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 18
+SUBLEVEL = 19
EXTRAVERSION =
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -110,63 +110,8 @@
LIBS =$(TOPDIR)/lib/lib.a
SUBDIRS =init kernel lib drivers mm fs net ipc sound
-DRIVERS-n :=
-DRIVERS-y :=
-DRIVERS-m :=
-DRIVERS- :=
-
-DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
-DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
-DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
-DRIVERS-y += drivers/base/base.o \
- drivers/char/char.o \
- drivers/block/block.o \
- drivers/misc/misc.o \
- drivers/net/net.o \
- drivers/media/media.o
-DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
-DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
-DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
-DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
-DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
-DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
-
-ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
-DRIVERS-y += drivers/cdrom/driver.o
-endif
-
+DRIVERS-y = drivers/built-in.o
DRIVERS-$(CONFIG_SOUND) += sound/sound.o
-DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
-DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
-DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
-DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
-DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
-DRIVERS-$(CONFIG_VT) += drivers/video/video.o
-DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
-DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
-DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
-DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
-DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
-DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
-DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
-DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
-DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
-DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
-DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
-DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
-
-# VAX-specific modules
-DRIVERS-$(CONFIG_VSBUS) += drivers/vsbus/vsbus.a
-DRIVERS-$(CONFIG_VAX) += drivers/vax/bus/vaxbus.o
-DRIVERS-$(CONFIG_VAX) += drivers/vax/char/vaxchar.o
-DRIVERS-$(CONFIG_VAX) += drivers/vax/net/vaxnet.o
-# End VAX-specific modules
DRIVERS := $(DRIVERS-y)
@@ -179,7 +124,7 @@
# ---------------------------------------------------------------------------
boot: vmlinux
- @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C arch/$(ARCH)/boot
+ @$(MAKE) -C arch/$(ARCH)/boot
# Build vmlinux
# ---------------------------------------------------------------------------
@@ -209,29 +154,40 @@
echo Generating build number
. scripts/mkversion > .tmpversion
mv -f .tmpversion .version
- $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C init
+ $(MAKE) -C init
echo $(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
endef
-vmlinux: $(CONFIGURATION) $(vmlinux-objs) dummy
+vmlinux: $(CONFIGURATION) $(vmlinux-objs) FORCE
$(call if_changed_rule,link_vmlinux)
-# The actual objects are generated when descending, make sure
-# no implicit rule kicks in
+# The actual objects are generated when descending,
+# make sure no implicit rule kicks in
-$(sort $(vmlinux-objs)): linuxsubdirs
- @
+$(sort $(vmlinux-objs)): $(SUBDIRS) ;
# Handle descending into subdirectories listed in $(SUBDIRS)
-.PHONY: linuxsubdirs
-linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
+.PHONY: $(SUBDIRS)
+$(SUBDIRS): FORCE include/linux/version.h include/config/MARKER
+ @$(MAKE) -C $@
+
+# Single targets
+# ---------------------------------------------------------------------------
-$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
- @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
+%.s: %.c FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.i: %.c FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.o: %.c FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.s: %.S FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.o: %.S FORCE
+ @$(MAKE) -C $(@D) $(@F)
# Configuration
# ---------------------------------------------------------------------------
@@ -273,7 +229,10 @@
@echo Generating $@
@. scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL)
-comma := ,
+# helpers built in scripts/
+
+scripts/mkdep scripts/split-include : FORCE
+ @$(MAKE) -C scripts
# ---------------------------------------------------------------------------
# Generate dependencies
@@ -282,11 +241,34 @@
dep-files: scripts/mkdep archdep include/linux/version.h
scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
- $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
+ @$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS))
ifdef CONFIG_MODVERSIONS
$(MAKE) update-modverfile
endif
+.PHONY: $(patsubst %,_sfdep_%,$(SUBDIRS))
+$(patsubst %,_sfdep_%,$(SUBDIRS)): FORCE
+ @$(MAKE) -C $(patsubst _sfdep_%, %, $@) fastdep
+
+# update modversions.h, but only if it would change
+update-modverfile:
+ @(echo "#ifndef _LINUX_MODVERSIONS_H";\
+ echo "#define _LINUX_MODVERSIONS_H"; \
+ echo "#include <linux/modsetver.h>"; \
+ cd $(TOPDIR)/include/linux/modules; \
+ for f in *.ver; do \
+ if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \
+ done; \
+ echo "#endif"; \
+ ) > $(TOPDIR)/include/linux/modversions.h.tmp
+ @if [ -r $(TOPDIR)/include/linux/modversions.h ] && cmp -s $(TOPDIR)/include/linux/modversions.h $(TOPDIR)/include/linux/modversions.h.tmp; then \
+ echo $(TOPDIR)/include/linux/modversions.h was not updated; \
+ rm -f $(TOPDIR)/include/linux/modversions.h.tmp; \
+ else \
+ echo $(TOPDIR)/include/linux/modversions.h was updated; \
+ mv -f $(TOPDIR)/include/linux/modversions.h.tmp $(TOPDIR)/include/linux/modversions.h; \
+ fi
+
# ---------------------------------------------------------------------------
# Modules
@@ -303,7 +285,7 @@
.PHONY: $(patsubst %, _mod_%, $(SUBDIRS))
$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h include/config/MARKER
- @$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(CFLAGS_MODULE)" AFLAGS="$(AFLAGS) $(AFLAGS_MODULE)" modules
+ @$(MAKE) -C $(patsubst _mod_%, %, $@) modules
# Install modules
@@ -340,7 +322,7 @@
# ---------------------------------------------------------------------------
# Modules not configured
-modules modules_install: dummy
+modules modules_install: FORCE
@echo
@echo "The present kernel configuration has modules disabled."
@echo "Type 'make config' and enable loadable module support."
@@ -350,19 +332,6 @@
endif # CONFIG_MODULES
-# ---------------------------------------------------------------------------
-
-include Rules.make
-
-# Build helpers in scripts/
-# FIXME: do that in scripts/Makefile?
-
-scripts/mkdep: scripts/mkdep.c
- $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
-
-scripts/split-include: scripts/split-include.c
- $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
-
# Cleaning up
# ---------------------------------------------------------------------------
@@ -487,25 +456,18 @@
# Generate tags for editors
-TAGS: dummy
+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 -name '*.[ch]' ; } | grep -v SCCS | etags -
# Exuberant ctags works better with -I
-tags: dummy
+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
-# Targets which will only descend into one subdir, not trying
-# to link vmlinux afterwards
-# FIXME: anybody still using this?
-
-fs lib mm ipc kernel drivers net sound: dummy
- $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
-
# Make a backup
# FIXME anybody still using this?
@@ -527,3 +489,4 @@
$(filter-out $(cmd_$(@F)),$(cmd_$(1)))),\
@$(rule_$(1)))
+FORCE:
Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Rules.make 9 Jan 2003 22:01:14 -0000 1.10
+++ Rules.make 12 Jan 2003 22:52:52 -0000 1.11
@@ -2,36 +2,25 @@
# This file contains rules which are shared between multiple Makefiles.
#
-#
-# False targets.
-#
-.PHONY: dummy
+# Some standard vars
-#
-# Special variables which should not be exported
-#
-unexport EXTRA_AFLAGS
-unexport EXTRA_CFLAGS
-unexport EXTRA_LDFLAGS
-unexport EXTRA_ARFLAGS
-unexport SUBDIRS
-unexport SUB_DIRS
-unexport ALL_SUB_DIRS
-unexport MOD_SUB_DIRS
-unexport O_TARGET
-
-unexport obj-y
-unexport obj-m
-unexport obj-n
-unexport obj-
-unexport export-objs
-unexport subdir-y
-unexport subdir-m
-unexport subdir-n
-unexport subdir-
-unexport mod-subdirs
+comma := ,
+empty :=
+space := $(empty) $(empty)
-comma := ,
+# Figure out paths
+# ---------------------------------------------------------------------------
+# Find the path relative to the toplevel dir, $(RELDIR), and express
+# the toplevel dir as a relative path from this dir, $(TOPDIR_REL)
+
+ifeq ($(findstring $(TOPDIR),$(CURDIR)),)
+ # Can only happen when something is built out of tree
+ RELDIR := $(CURDIR)
+ TOPDIR_REL := $(TOPDIR)
+else
+ RELDIR := $(subst $(TOPDIR)/,,$(CURDIR))
+ TOPDIR_REL := $(subst $(space),,$(foreach d,$(subst /, ,$(RELDIR)),../))
+endif
# Figure out what we need to build from the various variables
# ===========================================================================
@@ -63,7 +52,7 @@
# add it to $(subdir-m)
both-m := $(filter $(mod-subdirs), $(subdir-y))
-SUB_DIRS := $(subdir-y)
+SUB_DIRS := $(subdir-y) $(if $(BUILD_MODULES),$(subdir-m))
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
@@ -94,14 +83,14 @@
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)))
+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)))
# ==========================================================================
#
# Get things started.
#
-first_rule: all_targets
+first_rule: vmlinux $(if $(BUILD_MODULES),$(obj-m))
#
# Common rules
@@ -113,38 +102,61 @@
# Compile C sources (.c)
# ---------------------------------------------------------------------------
-$(export-objs): export_flags := $(EXPORT_FLAGS)
+# FIXME: if we don't know if built-in or modular, assume built-in.
+# Only happens in Makefiles which override the default first_rule:
+modkern_cflags := $(CFLAGS_KERNEL)
+
+$(real-objs-y) : modkern_cflags := $(CFLAGS_KERNEL)
+$(real-objs-y:.o=.i): modkern_cflags := $(CFLAGS_KERNEL)
+$(real-objs-y:.o=.s): modkern_cflags := $(CFLAGS_KERNEL)
+
+$(real-objs-m) : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.i): modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.s): modkern_cflags := $(CFLAGS_MODULE)
-c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(export_flags)
+$(export-objs) : export_flags := $(EXPORT_FLAGS)
+$(export-objs:.o=.i): export_flags := $(EXPORT_FLAGS)
+$(export-objs:.o=.s): export_flags := $(EXPORT_FLAGS)
-cmd_cc_s_c = $(CC) $(c_flags) -S $< -o $@
+c_flags = $(CFLAGS) $(modkern_cflags) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(export_flags)
-%.s: %.c dummy
+cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
+
+%.s: %.c FORCE
$(call if_changed,cmd_cc_s_c)
-cmd_cc_i_c = $(CPP) $(c_flags) $< > $@
+cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $<
-%.i: %.c dummy
+%.i: %.c FORCE
$(call if_changed,cmd_cc_i_c)
cmd_cc_o_c = $(CC) $(c_flags) $(listing_o_c) -c -o $@ $<
-%.o: %.c dummy
+%.o: %.c FORCE
$(call if_changed,cmd_cc_o_c)
# Compile assembler sources (.S)
# ---------------------------------------------------------------------------
-a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
+# FIXME (s.a.)
+modkern_aflags := $(AFLAGS_KERNEL)
+
+$(real-objs-y) : modkern_aflags := $(AFLAGS_KERNEL)
+$(real-objs-y:.o=.s): modkern_aflags := $(AFLAGS_KERNEL)
+
+$(real-objs-m) : modkern_aflags := $(AFLAGS_MODULE)
+$(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
-cmd_as_s_S = $(CPP) $(a_flags) $< > $@
+a_flags = $(AFLAGS) $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
-%.s: %.S dummy
+cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
+
+%.s: %.S FORCE
$(call if_changed,cmd_as_s_S)
cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
-%.o: %.S dummy
+%.o: %.S FORCE
$(call if_changed,cmd_as_o_S)
# FIXME
@@ -166,10 +178,10 @@
# Build the compiled-in targets
# ---------------------------------------------------------------------------
-all_targets: $(O_TARGET) $(L_TARGET) sub_dirs
+vmlinux: $(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS) sub_dirs
# To build objects in subdirs, we need to descend into the directories
-$(subdir-obj-y): sub_dirs
+$(sort $(subdir-obj-y)): sub_dirs ;
#
# Rule to compile a set of .o files into one .o file
@@ -180,7 +192,7 @@
$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $(obj-y), $^),\
rm -f $@; $(AR) rcs $@)
-$(O_TARGET): $(obj-y) dummy
+$(O_TARGET): $(obj-y) FORCE
$(call if_changed,cmd_link_o_target)
endif # O_TARGET
@@ -190,7 +202,7 @@
ifdef L_TARGET
cmd_link_l_target = rm -f $@; $(AR) $(EXTRA_ARFLAGS) rcs $@ $(obj-y)
-$(L_TARGET): $(obj-y) dummy
+$(L_TARGET): $(obj-y) FORCE
$(call if_changed,cmd_link_l_target)
endif
@@ -205,16 +217,16 @@
# 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) dummy
+$(multi-used-y) : %.o: $(multi-objs-y) FORCE
$(call if_changed,cmd_link_multi)
-$(multi-used-m) : %.o: $(multi-objs-m) dummy
+$(multi-used-m) : %.o: $(multi-objs-m) FORCE
$(call if_changed,cmd_link_multi)
#
# This make dependencies quickly
#
-fastdep: dummy
+fastdep: FORCE
$(TOPDIR)/scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS) -- $(wildcard *.[chS]) > .depend
ifdef ALL_SUB_DIRS
$(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)"
@@ -230,53 +242,48 @@
# A rule to make subdirectories
#
subdir-list = $(sort $(patsubst %,_subdir_%,$(SUB_DIRS)))
-sub_dirs: dummy $(subdir-list)
+sub_dirs: FORCE $(subdir-list)
ifdef SUB_DIRS
-$(subdir-list) : dummy
+$(subdir-list) : FORCE
@$(MAKE) -C $(patsubst _subdir_%,%,$@)
endif
#
# A rule to make modules
#
-ifneq "$(strip $(obj-m))" ""
-MOD_DESTDIR := $(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
-endif
-
ifneq "$(strip $(MOD_SUB_DIRS))" ""
.PHONY: $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
-$(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS)) : dummy
+$(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS)) : FORCE
@$(MAKE) -C $(patsubst _modsubdir_%,%,$@) modules
.PHONY: $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
-$(patsubst %,_modinst_%,$(MOD_SUB_DIRS)) : dummy
+$(patsubst %,_modinst_%,$(MOD_SUB_DIRS)) : FORCE
@$(MAKE) -C $(patsubst _modinst_%,%,$@) modules_install
endif
.PHONY: modules
-modules: $(obj-m) dummy \
- $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
+modules: $(obj-m) FORCE $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
.PHONY: _modinst__
-_modinst__: dummy
+_modinst__: FORCE
ifneq "$(strip $(obj-m))" ""
- mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR)
- cp $(obj-m) $(MODLIB)/kernel/$(MOD_DESTDIR)
+ mkdir -p $(MODLIB)/kernel/$(RELDIR)
+ cp $(obj-m) $(MODLIB)/kernel/$(RELDIR)
endif
.PHONY: modules_install
-modules_install: _modinst__ \
- $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
+modules_install: _modinst__ $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
-#
-# A rule to do nothing
-#
-dummy:
+
+# Add FORCE to the prequisites of a target to force it to be always rebuilt.
+# ---------------------------------------------------------------------------
+.PHONY: FORCE
+FORCE:
#
# This is useful for testing
-#
+# FIXME: really?
script:
$(SCRIPT)
@@ -293,12 +300,9 @@
ifdef CONFIG_MODVERSIONS
ifneq "$(strip $(export-objs))" ""
-MODINCL = $(TOPDIR)/include/linux/modules
-MODCURDIR = $(subst $(TOPDIR)/,,$(shell /bin/pwd))
-MODPREFIX = $(subst /,-,$(MODCURDIR))__
+MODINCL := $(TOPDIR)/include/linux/modules
+MODPREFIX := $(subst /,-,$(RELDIR))__
-# The -w option (enable warnings) for genksyms will return here in 2.1
-# So where has it gone?
#
# Added the SMP separator to stop module accidents between uniprocessor
# and SMP Intel boxes - AC - from bits by Michael Chastain
@@ -325,30 +329,8 @@
# updates .ver files but not modversions.h
fastdep: $(addprefix $(MODINCL)/$(MODPREFIX),$(export-objs:.o=.ver))
-# updates .ver files and modversions.h like before (is this needed?)
-dep: fastdep update-modverfile
-
endif # export-objs
-# update modversions.h, but only if it would change
-update-modverfile:
- @(echo "#ifndef _LINUX_MODVERSIONS_H";\
- echo "#define _LINUX_MODVERSIONS_H"; \
- echo "#include <linux/modsetver.h>"; \
- cd $(TOPDIR)/include/linux/modules; \
- for f in *.ver; do \
- if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \
- done; \
- echo "#endif"; \
- ) > $(TOPDIR)/include/linux/modversions.h.tmp
- @if [ -r $(TOPDIR)/include/linux/modversions.h ] && cmp -s $(TOPDIR)/include/linux/modversions.h $(TOPDIR)/include/linux/modversions.h.tmp; then \
- echo $(TOPDIR)/include/linux/modversions.h was not updated; \
- rm -f $(TOPDIR)/include/linux/modversions.h.tmp; \
- else \
- echo $(TOPDIR)/include/linux/modversions.h was updated; \
- mv -f $(TOPDIR)/include/linux/modversions.h.tmp $(TOPDIR)/include/linux/modversions.h; \
- fi
-
$(active-objs): $(TOPDIR)/include/linux/modversions.h
else
@@ -365,7 +347,6 @@
endif
endif # CONFIG_MODULES
-
#
# include dependency files if they exist
|
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:52:56
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1:/tmp/cvs-serv30622/drivers/char Modified Files: Makefile Log Message: Merge with 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 9 Jan 2003 22:10:44 -0000 1.9 +++ Makefile 12 Jan 2003 22:52:53 -0000 1.10 @@ -7,8 +7,6 @@ # FONTMAPFILE = cp437.uni -O_TARGET := char.o - obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o # All of the (potential) objects that export symbols. |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:52:56
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv30622/drivers Modified Files: Makefile Log Message: Merge with 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 30 Dec 2002 03:02:37 -0000 1.8 +++ Makefile 12 Jan 2003 22:52:53 -0000 1.9 @@ -9,45 +9,47 @@ mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \ message scsi md ieee1394 pnp isdn atm \ fc4 i2c acpi bluetooth input/serio \ - input/gameport parport hotplug + input/gameport parport hotplug \ + base char block misc net media cdrom -subdir-y := base parport char block net misc media cdrom hotplug -subdir-m := $(subdir-y) +obj-$(CONFIG_PCI) += pci/ +obj-$(CONFIG_ACPI) += acpi/ +obj-$(CONFIG_PARPORT) += parport/ +obj-y += base/ char/ block/ misc/ net/ media/ +obj-$(CONFIG_NUBUS) += nubus/ +obj-$(CONFIG_ATM) += atm/ +obj-$(CONFIG_IDE) += ide/ +obj-$(CONFIG_FC4) += fc4/ +obj-$(CONFIG_SCSI) += scsi/ +obj-$(CONFIG_FUSION) += message/ +obj-$(CONFIG_IEEE1394) += ieee1394/ +obj-y += cdrom/ +obj-$(CONFIG_MTD) += mtd/ +obj-$(CONFIG_PCMCIA) += pcmcia/ +obj-$(CONFIG_DIO) += dio/ +obj-$(CONFIG_SBUS) += sbus/ +obj-$(CONFIG_ZORRO) += zorro/ +obj-$(CONFIG_ALL_PPC) += macintosh/ +obj-$(CONFIG_MAC) += macintosh/ +obj-$(CONFIG_PNP) += pnp/ +obj-$(CONFIG_SGI) += sgi/ +obj-$(CONFIG_VT) += video/ +obj-$(CONFIG_PARIDE) += block/paride/ +obj-$(CONFIG_TC) += tc/ +obj-$(CONFIG_USB) += usb/ +obj-$(CONFIG_INPUT) += input/ +obj-$(CONFIG_GAMEPORT) += input/gameport/ +obj-$(CONFIG_SERIO) += input/serio/ +obj-$(CONFIG_I2O) += message/ +obj-$(CONFIG_I2C) += i2c/ +obj-$(CONFIG_PHONE) += telephony/ +obj-$(CONFIG_MD) += md/ +obj-$(CONFIG_BLUEZ) += bluetooth/ +obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ +obj-$(CONFIG_ISDN) += isdn/ - -subdir-$(CONFIG_DIO) += dio -subdir-$(CONFIG_PCI) += pci -subdir-$(CONFIG_PCMCIA) += pcmcia -subdir-$(CONFIG_MTD) += mtd -subdir-$(CONFIG_SBUS) += sbus -subdir-$(CONFIG_ZORRO) += zorro -subdir-$(CONFIG_NUBUS) += nubus -subdir-$(CONFIG_TC) += tc -subdir-$(CONFIG_VT) += video -subdir-$(CONFIG_MAC) += macintosh -subdir-$(CONFIG_ALL_PPC) += macintosh -subdir-$(CONFIG_USB) += usb -subdir-$(CONFIG_INPUT) += input -subdir-$(CONFIG_SERIO) += input/serio -subdir-$(CONFIG_GAMEPORT) += input/gameport -subdir-$(CONFIG_PHONE) += telephony -subdir-$(CONFIG_SGI) += sgi -subdir-$(CONFIG_IDE) += ide -subdir-$(CONFIG_SCSI) += scsi -subdir-$(CONFIG_I2O) += message -subdir-$(CONFIG_FUSION) += message -subdir-$(CONFIG_MD) += md -subdir-$(CONFIG_IEEE1394) += ieee1394 -subdir-$(CONFIG_PNP) += pnp -subdir-$(CONFIG_ISDN) += isdn -subdir-$(CONFIG_ATM) += atm -subdir-$(CONFIG_FC4) += fc4 -subdir-$(CONFIG_VAX) += vax -subdir-$(CONFIG_VSBUS) += vsbus - -subdir-$(CONFIG_I2C) += i2c -subdir-$(CONFIG_ACPI) += acpi - -subdir-$(CONFIG_BLUEZ) += bluetooth +# VAX-specific stuff +obj-$(CONFIG_VAX) += vax/ +obj-$(CONFIG_VSBUS) += vsbus/ include $(TOPDIR)/Rules.make |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:49:28
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vsbus In directory sc8-pr-cvs1:/tmp/cvs-serv29259/drivers/vsbus Modified Files: Makefile Log Message: drivers/vsbus now compiles to drivers/vsbus/built-in.o like pretty much everything else. Why were we making a vsbus.a, rather than vsbus.o? Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vsbus/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 20 May 2002 00:33:37 -0000 1.3 +++ Makefile 12 Jan 2003 22:49:24 -0000 1.4 @@ -11,7 +11,6 @@ MOD_SUB_DIRS := ALL_SUB_DIRS := -L_TARGET := vsbus.a obj-y := vsbus.o include $(TOPDIR)/Rules.make |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:46:44
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/base In directory sc8-pr-cvs1:/tmp/cvs-serv28507/drivers/base Modified Files: bus.c Log Message: Add missing #include <linux/init.h>. Index: bus.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/base/bus.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- bus.c 12 Jan 2003 18:57:33 -0000 1.1.1.1 +++ bus.c 12 Jan 2003 22:46:40 -0000 1.2 @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/errno.h> #include <linux/stat.h> +#include <linux/init.h> #include "base.h" static LIST_HEAD(bus_driver_list); |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:45:05
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv28089/arch/vax/kernel
Modified Files:
signal.c
Log Message:
2.5.19 moves some common signal handling code out of arch code and into
core kernel
Index: signal.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/signal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- signal.c 7 Dec 2002 00:14:56 -0000 1.6
+++ signal.c 12 Jan 2003 22:45:02 -0000 1.7
@@ -44,41 +44,6 @@
int do_signal(sigset_t *oldset, struct pt_regs *regs);
-int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from)
-{
- if (!access_ok (VERIFY_WRITE, to, sizeof(siginfo_t)))
- return -EFAULT;
- if (from->si_code < 0)
- return __copy_to_user(to, from, sizeof(siginfo_t));
- else {
- int err;
-
- /* If you change siginfo_t structure, please be sure
- this code is fixed accordingly.
- It should never copy any pad contained in the structure
- to avoid security leaks, but must copy the generic
- 3 ints plus the relevant union member. */
- err = __put_user(from->si_signo, &to->si_signo);
- err |= __put_user(from->si_errno, &to->si_errno);
- err |= __put_user((short)from->si_code, &to->si_code);
- /* First 32bits of unions are always present. */
- err |= __put_user(from->si_pid, &to->si_pid);
- switch (from->si_code >> 16) {
- case __SI_FAULT >> 16:
- break;
- case __SI_CHLD >> 16:
- err |= __put_user(from->si_utime, &to->si_utime);
- err |= __put_user(from->si_stime, &to->si_stime);
- err |= __put_user(from->si_status, &to->si_status);
- default:
- err |= __put_user(from->si_uid, &to->si_uid);
- break;
- /* case __SI_RT: This is not generated by the kernel as of now. */
- }
- return err;
- }
-}
-
/*
* Atomically swap in the new signal mask, and wait for a signal.
*/
@@ -590,9 +555,11 @@
*/
static inline void
-handle_signal(int canrestart, unsigned long sig, struct k_sigaction *ka,
- siginfo_t *info, sigset_t *oldset, struct pt_regs * regs)
+handle_signal(int canrestart, unsigned long sig, siginfo_t *info,
+ sigset_t *oldset, struct pt_regs * regs)
{
+ struct k_sigaction *ka = ¤t->sig->action[sig-1];
+
/* Are we from a system call? */
if (canrestart) {
/* If so, check system call restarting.. */
@@ -648,7 +615,7 @@
int do_signal(sigset_t *oldset, struct pt_regs *regs)
{
siginfo_t info;
- struct k_sigaction *ka;
+ int signr;
int canrestart;
/*
* We want the common case to go fast, which
@@ -668,113 +635,10 @@
oldset = ¤t->blocked;
- for (;;) {
- unsigned long signr;
-
- spin_lock_irq(¤t->sigmask_lock);
- signr = dequeue_signal(¤t->blocked, &info);
- spin_unlock_irq(¤t->sigmask_lock);
-#ifdef DEBUG_SIG
- printk(" sig %d\n",signr);
-#endif
- if (!signr)
- break;
-
- if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
- /* Let the debugger run. */
- current->exit_code = signr;
- current->state = TASK_STOPPED;
- notify_parent(current, SIGCHLD);
- schedule();
-
- /* We're back. Did the debugger cancel the sig? */
- if (!(signr = current->exit_code))
- continue;
- current->exit_code = 0;
-
- /* The debugger continued. Ignore SIGSTOP. */
- if (signr == SIGSTOP)
- continue;
-
- /* Update the siginfo structure. Is this good? */
- if (signr != info.si_signo) {
- info.si_signo = signr;
- info.si_errno = 0;
- info.si_code = SI_USER;
- info.si_pid = current->parent->pid;
- info.si_uid = current->parent->uid;
- }
-
- /* If the (new) signal is now blocked, requeue it. */
- if (sigismember(¤t->blocked, signr)) {
- send_sig_info(signr, &info, current);
- continue;
- }
- }
-
- ka = ¤t->sig->action[signr-1];
- if (ka->sa.sa_handler == SIG_IGN) {
- if (signr != SIGCHLD)
- continue;
-#ifdef DEBUG_SIG
- printk("do_signal: waiting for sigchld\n");
-#endif
- /* Check for SIGCHLD: it's special. */
- while (sys_wait4(-1, NULL, WNOHANG, NULL) > 0)
- /* nothing */;
- continue;
- }
-
- if (ka->sa.sa_handler == SIG_DFL) {
- int exit_code = signr;
-#ifdef DEBUG_SIG
- printk("do_signal: invoking default handler for sig %d\n",signr);
-#endif
- /* Init gets no signals it doesn't want. */
- if (current->pid == 1)
- continue;
-
- switch (signr) {
- case SIGCONT: case SIGCHLD: case SIGWINCH:
- continue;
-
- case SIGTSTP: case SIGTTIN: case SIGTTOU:
- if (is_orphaned_pgrp(current->pgrp))
- continue;
- /* FALLTHRU */
-
- case SIGSTOP:
- current->state = TASK_STOPPED;
- current->exit_code = signr;
- if (!(current->parent->sig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDSTOP))
- notify_parent(current, SIGCHLD);
- schedule();
- continue;
-
- case SIGQUIT: case SIGILL: case SIGTRAP:
- case SIGABRT: case SIGFPE: case SIGSEGV:
- case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
- if (do_coredump(signr, regs))
- exit_code |= 0x80;
- /* FALLTHRU */
-
- default:
- //lock_kernel();
- sigaddset(¤t->pending.signal, signr);
- recalc_sigpending();
- current->flags |= PF_SIGNALED;
-#ifdef DEBUG_SIG
- printk("handle_sig: do_exit exit_code=%d\n",exit_code);
-#endif
- do_exit(exit_code);
- /* NOTREACHED */
- }
- }
-#ifdef DEBUG_SIG
- printk("do_signal: handle_signal(canrestart=%d,signr=%d,info=%p,ka->sa.sa_handler=%p)\n",canrestart,signr,info,ka->sa.sa_handler);
-#endif
+ signr = get_signal_to_deliver(&info, regs);
+ if (signr > 0) {
/* Whee! Actually deliver the signal. */
- handle_signal(canrestart, signr, ka, &info, oldset, regs);
+ handle_signal(canrestart, signr, &info, oldset, regs);
return 1;
}
|
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:40:37
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1:/tmp/cvs-serv26507/arch/vax Modified Files: Makefile Log Message: Remove unused LDFLAGS definitions. Use rule_vmlinux_link as defined in top-level makefile in the archonly rule. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 28 Dec 2002 02:06:21 -0000 1.6 +++ Makefile 12 Jan 2003 22:40:34 -0000 1.7 @@ -28,10 +28,6 @@ CFLAGS := $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_NSR) - -# These flags are used later in _this_ makefile -LDFLAGS=-nostartfiles -N -nostdlib -Map test.map --cref -T vmlinux.lds - # These flags are used by the top-level makefile when linking # the kernel LINKFLAGS=-T arch/vax/vmlinux.lds \ @@ -55,6 +51,7 @@ vmlinux: $(HEAD) $(ARCHLIBS) SUBDIRS := $(SUBDIRS) arch/vax/kernel arch/vax/mm arch/vax/lib arch/vax/boot + CORE_FILES := arch/vax/kernel/kernel.o arch/vax/mm/mm.o $(CORE_FILES) @@ -111,23 +108,12 @@ @echo " " $(SETCMDLINE) @echo " " -# This is copied from the top-level Makefile -linkonly: dummy +linkonly: FORCE $(MAKE) -C arch/vax/lib $(MAKE) -C arch/vax/mm $(MAKE) -C arch/vax/kernel $(MAKE) -C arch/vax/boot - $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \ - --start-group \ - $(CORE_FILES) \ - $(LIBS) \ - $(DRIVERS) \ - $(NETWORKS) \ - --end-group \ - -o vmlinux - $(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aU] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map - - + @$(call rule_link_vmlinux) #$(HEAD): libboot |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:35:49
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv25670/include/asm Modified Files: errno.h Log Message: Use Exxx errno defintions from <asm-generic/errno.h> Index: errno.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/errno.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- errno.h 20 May 2002 00:33:39 -0000 1.3 +++ errno.h 12 Jan 2003 22:35:44 -0000 1.4 @@ -1,134 +1,6 @@ #ifndef _VAX_ERRNO_H #define _VAX_ERRNO_H -/* from i386 (atp 1998 ) */ - -#define EPERM 1 /* Operation not permitted */ -#define ENOENT 2 /* No such file or directory */ -#define ESRCH 3 /* No such process */ -#define EINTR 4 /* Interrupted system call */ -#define EIO 5 /* I/O error */ -#define ENXIO 6 /* No such device or address */ -#define E2BIG 7 /* Arg list too long */ -#define ENOEXEC 8 /* Exec format error */ -#define EBADF 9 /* Bad file number */ -#define ECHILD 10 /* No child processes */ -#define EAGAIN 11 /* Try again */ -#define ENOMEM 12 /* Out of memory */ -#define EACCES 13 /* Permission denied */ -#define EFAULT 14 /* Bad address */ -#define ENOTBLK 15 /* Block device required */ -#define EBUSY 16 /* Device or resource busy */ -#define EEXIST 17 /* File exists */ -#define EXDEV 18 /* Cross-device link */ -#define ENODEV 19 /* No such device */ -#define ENOTDIR 20 /* Not a directory */ -#define EISDIR 21 /* Is a directory */ -#define EINVAL 22 /* Invalid argument */ -#define ENFILE 23 /* File table overflow */ -#define EMFILE 24 /* Too many open files */ -#define ENOTTY 25 /* Not a typewriter */ -#define ETXTBSY 26 /* Text file busy */ -#define EFBIG 27 /* File too large */ -#define ENOSPC 28 /* No space left on device */ -#define ESPIPE 29 /* Illegal seek */ -#define EROFS 30 /* Read-only file system */ -#define EMLINK 31 /* Too many links */ -#define EPIPE 32 /* Broken pipe */ -#define EDOM 33 /* Math argument out of domain of func */ -#define ERANGE 34 /* Math result not representable */ -#define EDEADLK 35 /* Resource deadlock would occur */ -#define ENAMETOOLONG 36 /* File name too long */ -#define ENOLCK 37 /* No record locks available */ -#define ENOSYS 38 /* Function not implemented */ -#define ENOTEMPTY 39 /* Directory not empty */ -#define ELOOP 40 /* Too many symbolic links encountered */ -#define EWOULDBLOCK EAGAIN /* Operation would block */ -#define ENOMSG 42 /* No message of desired type */ -#define EIDRM 43 /* Identifier removed */ -#define ECHRNG 44 /* Channel number out of range */ -#define EL2NSYNC 45 /* Level 2 not synchronized */ -#define EL3HLT 46 /* Level 3 halted */ -#define EL3RST 47 /* Level 3 reset */ -#define ELNRNG 48 /* Link number out of range */ -#define EUNATCH 49 /* Protocol driver not attached */ -#define ENOCSI 50 /* No CSI structure available */ -#define EL2HLT 51 /* Level 2 halted */ -#define EBADE 52 /* Invalid exchange */ -#define EBADR 53 /* Invalid request descriptor */ -#define EXFULL 54 /* Exchange full */ -#define ENOANO 55 /* No anode */ -#define EBADRQC 56 /* Invalid request code */ -#define EBADSLT 57 /* Invalid slot */ - -#define EDEADLOCK EDEADLK - -#define EBFONT 59 /* Bad font file format */ -#define ENOSTR 60 /* Device not a stream */ -#define ENODATA 61 /* No data available */ -#define ETIME 62 /* Timer expired */ -#define ENOSR 63 /* Out of streams resources */ -#define ENONET 64 /* Machine is not on the network */ -#define ENOPKG 65 /* Package not installed */ -#define EREMOTE 66 /* Object is remote */ -#define ENOLINK 67 /* Link has been severed */ -#define EADV 68 /* Advertise error */ -#define ESRMNT 69 /* Srmount error */ -#define ECOMM 70 /* Communication error on send */ -#define EPROTO 71 /* Protocol error */ -#define EMULTIHOP 72 /* Multihop attempted */ -#define EDOTDOT 73 /* RFS specific error */ -#define EBADMSG 74 /* Not a data message */ -#define EOVERFLOW 75 /* Value too large for defined data type */ -#define ENOTUNIQ 76 /* Name not unique on network */ -#define EBADFD 77 /* File descriptor in bad state */ -#define EREMCHG 78 /* Remote address changed */ -#define ELIBACC 79 /* Can not access a needed shared library */ -#define ELIBBAD 80 /* Accessing a corrupted shared library */ -#define ELIBSCN 81 /* .lib section in a.out corrupted */ -#define ELIBMAX 82 /* Attempting to link in too many shared libraries */ -#define ELIBEXEC 83 /* Cannot exec a shared library directly */ -#define EILSEQ 84 /* Illegal byte sequence */ -#define ERESTART 85 /* Interrupted system call should be restarted */ -#define ESTRPIPE 86 /* Streams pipe error */ -#define EUSERS 87 /* Too many users */ -#define ENOTSOCK 88 /* Socket operation on non-socket */ -#define EDESTADDRREQ 89 /* Destination address required */ -#define EMSGSIZE 90 /* Message too long */ -#define EPROTOTYPE 91 /* Protocol wrong type for socket */ -#define ENOPROTOOPT 92 /* Protocol not available */ -#define EPROTONOSUPPORT 93 /* Protocol not supported */ -#define ESOCKTNOSUPPORT 94 /* Socket type not supported */ -#define EOPNOTSUPP 95 /* Operation not supported on transport endpoint */ -#define EPFNOSUPPORT 96 /* Protocol family not supported */ -#define EAFNOSUPPORT 97 /* Address family not supported by protocol */ -#define EADDRINUSE 98 /* Address already in use */ -#define EADDRNOTAVAIL 99 /* Cannot assign requested address */ -#define ENETDOWN 100 /* Network is down */ -#define ENETUNREACH 101 /* Network is unreachable */ -#define ENETRESET 102 /* Network dropped connection because of reset */ -#define ECONNABORTED 103 /* Software caused connection abort */ -#define ECONNRESET 104 /* Connection reset by peer */ -#define ENOBUFS 105 /* No buffer space available */ -#define EISCONN 106 /* Transport endpoint is already connected */ -#define ENOTCONN 107 /* Transport endpoint is not connected */ -#define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */ -#define ETOOMANYREFS 109 /* Too many references: cannot splice */ -#define ETIMEDOUT 110 /* Connection timed out */ -#define ECONNREFUSED 111 /* Connection refused */ -#define EHOSTDOWN 112 /* Host is down */ -#define EHOSTUNREACH 113 /* No route to host */ -#define EALREADY 114 /* Operation already in progress */ -#define EINPROGRESS 115 /* Operation now in progress */ -#define ESTALE 116 /* Stale NFS file handle */ -#define EUCLEAN 117 /* Structure needs cleaning */ -#define ENOTNAM 118 /* Not a XENIX named type file */ -#define ENAVAIL 119 /* No XENIX semaphores available */ -#define EISNAM 120 /* Is a named type file */ -#define EREMOTEIO 121 /* Remote I/O error */ -#define EDQUOT 122 /* Quota exceeded */ - -#define ENOMEDIUM 123 /* No medium found */ -#define EMEDIUMTYPE 124 /* Wrong medium type */ +#include <asm-generic/errno.h> #endif /* _VAX_ERRNO_H */ |
|
From: Kenn H. <ke...@us...> - 2003-01-12 22:15:52
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv19362/include/asm Modified Files: suspend.h Log Message: Nothing includes this, but it's still required since mkdep picks it up as a dependency of linux/suspend.h. I suspect this will be fixed in a few revs and then we can delete it again. Index: suspend.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/suspend.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- suspend.h 11 Jan 2003 15:38:39 -0000 1.1 +++ suspend.h 12 Jan 2003 22:15:47 -0000 1.2 @@ -1,2 +1,2 @@ -#warning Temporary <asm/suspend.h> - remove this file in 2.5.19 +#error Temporary <asm/suspend.h> - nothing should be including this file |
|
From: Kenn H. <ke...@us...> - 2003-01-11 15:38:45
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv14339 Added Files: suspend.h Log Message: Temporary <asm/suspend.h> to allow 2.5.18 to compile --- NEW FILE --- #warning Temporary <asm/suspend.h> - remove this file in 2.5.19 |
|
From: Kenn H. <ke...@us...> - 2003-01-11 15:38:02
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1:/tmp/cvs-serv14109 Modified Files: bitops.h Log Message: 2.5.18 needs a definition of fls() (find last set bit) Index: bitops.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bitops.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bitops.h 1 Dec 2002 23:54:43 -0000 1.6 +++ bitops.h 11 Jan 2003 15:37:58 -0000 1.7 @@ -356,6 +356,14 @@ return word; } + +/* + * fls: find last bit set. + */ + +#define fls(x) generic_fls(x) + + #ifdef __KERNEL__ /* |
|
From: Kenn H. <ke...@us...> - 2003-01-11 15:36:18
|
Update of /cvsroot/linux-vax/kernel-2.5/init In directory sc8-pr-cvs1:/tmp/cvs-serv13415/init Modified Files: main.c Log Message: Merge with 2.5.18 Index: main.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/init/main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- main.c 15 Dec 2002 00:41:33 -0000 1.10 +++ main.c 11 Jan 2003 15:36:13 -0000 1.11 @@ -68,6 +68,7 @@ extern void sbus_init(void); extern void sysctl_init(void); extern void signals_init(void); +extern void buffer_init(void); extern void radix_tree_init(void); extern void free_initmem(void); |
|
From: Kenn H. <ke...@us...> - 2003-01-09 22:10:50
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1:/tmp/cvs-serv20011/drivers/scsi Modified Files: Makefile Log Message: Merge with 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 13 Dec 2002 01:42:43 -0000 1.5 +++ Makefile 9 Jan 2003 22:10:46 -0000 1.6 @@ -25,10 +25,8 @@ mod-subdirs := pcmcia ../acorn/scsi -subdir-$(CONFIG_SCSI_AIC7XXX) += aic7xxx subdir-$(CONFIG_PCMCIA) += pcmcia - obj-$(CONFIG_SCSI) += scsi_mod.o obj-$(CONFIG_A4000T_SCSI) += amiga7xx.o 53c7xx.o @@ -64,9 +62,7 @@ obj-$(CONFIG_SCSI_AHA152X) += aha152x.o obj-$(CONFIG_SCSI_AHA1542) += aha1542.o obj-$(CONFIG_SCSI_AHA1740) += aha1740.o -ifeq ($(CONFIG_SCSI_AIC7XXX),y) -obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx_drv.o -endif +obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/ obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o obj-$(CONFIG_SCSI_IPS) += ips.o obj-$(CONFIG_SCSI_FD_MCS) += fd_mcs.o @@ -87,10 +83,7 @@ obj-$(CONFIG_SCSI_DMX3191D) += dmx3191d.o obj-$(CONFIG_SCSI_DTC3280) += dtc.o obj-$(CONFIG_SCSI_NCR53C7xx) += 53c7,8xx.o -subdir-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2 -ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y) - obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/sym53c8xx_2.o -endif +obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/ obj-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o obj-$(CONFIG_SCSI_NCR53C8XX) += ncr53c8xx.o obj-$(CONFIG_SCSI_EATA_DMA) += eata_dma.o @@ -129,8 +122,7 @@ obj-$(CONFIG_SCSI_CPQFCTS) += cpqfc.o obj-$(CONFIG_SCSI_LASI700) += lasi700.o 53c700.o -subdir-$(CONFIG_ARCH_ACORN) += ../acorn/scsi -obj-$(CONFIG_ARCH_ACORN) += ../acorn/scsi/acorn-scsi.o +obj-$(CONFIG_ARCH_ACORN) += ../acorn/scsi/ obj-$(CONFIG_CHR_DEV_ST) += st.o obj-$(CONFIG_CHR_DEV_OSST) += osst.o |
