2.4.19

diff -urN linux-2.4.18/Makefile linux-2.4.19/Makefile
--- linux-2.4.18/Makefile   Mon Feb 25 11:37:52 2002
+++ linux-2.4.19/Makefile   Fri Aug  2 17:39:46 2002
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 18
+SUBLEVEL = 19
 EXTRAVERSION =
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -14,7 +14,7 @@
 TOPDIR   := $(shell /bin/pwd)
 
 HPATH      = $(TOPDIR)/include
-FINDHPATH   = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net
+FINDHPATH   = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
 
 HOSTCC     = gcc
 HOSTCFLAGS   = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
@@ -89,7 +89,10 @@
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-     -fomit-frame-pointer -fno-strict-aliasing -fno-common
+     -fno-strict-aliasing -fno-common
+ifndef CONFIG_FRAME_POINTER
+CFLAGS += -fomit-frame-pointer
+endif
 AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
 
 #
@@ -140,9 +143,8 @@
 DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
 DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o
 DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
 DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
-DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
+DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
 DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
 DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
 DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
@@ -168,7 +170,7 @@
 DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
 DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
 DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
-DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
+DRIVERS-$(CONFIG_PPC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
 DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
@@ -185,6 +187,7 @@
 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_BOOL) += drivers/isdn/vmlinux-obj.o
 
 DRIVERS := $(DRIVERS-y)
 
@@ -201,10 +204,15 @@
    drivers/zorro/devlist.h drivers/zorro/gen-devlist \
    drivers/sound/bin2hex drivers/sound/hex2hex \
    drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
+   drivers/scsi/aic7xxx/aicasm/aicasm \
    drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
+   drivers/scsi/aic7xxx/aicasm/aicasm_gram.h \
+   drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.c \
+   drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.h \
+   drivers/scsi/aic7xxx/aicasm/aicasm_macro_scan.c \
    drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
+   drivers/scsi/aic7xxx/aicasm/aicdb.h \
    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 \
@@ -243,6 +251,16 @@
 
 include arch/$(ARCH)/Makefile
 
+# Extra cflags for kbuild 2.4.  The default is to forbid includes by kernel code
+# from user space headers.  Some UML code requires user space headers, in the
+# UML Makefiles add 'kbuild_2_4_nostdinc :=' before include Rules.make.  No
+# other kernel code should include user space headers, if you need
+# 'kbuild_2_4_nostdinc :=' or -I/usr/include for kernel code and you are not UML
+# then your code is broken!  KAO.
+
+kbuild_2_4_nostdinc   := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+export kbuild_2_4_nostdinc
+
 export   CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
 
 export   NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
@@ -258,8 +276,8 @@
 boot: vmlinux
    @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot
 
-vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o linuxsubdirs
-   $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \
+vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o init/do_mounts.o linuxsubdirs
+   $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \
       --start-group \
       $(CORE_FILES) \
       $(DRIVERS) \
@@ -306,25 +324,29 @@
    . scripts/mkversion > .tmpversion
    @mv -f .tmpversion .version
 
+uts_len      := 64
+uts_truncate   := sed -e 's/\(.\{1,$(uts_len)\}\).*/\1/'
+
 include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
-   @echo -n \#define UTS_VERSION \"\#`cat .version` > .ver
-   @if [ -n "$(CONFIG_SMP)" ] ; then echo -n " SMP" >> .ver; fi
-   @if [ -f .name ]; then  echo -n \-`cat .name` >> .ver; fi
-   @echo ' '`date`'"' >> .ver
-   @echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver
+   @echo -n \#`cat .version` > .ver1
+   @if [ -n "$(CONFIG_SMP)" ] ; then echo -n " SMP" >> .ver1; fi
+   @if [ -f .name ]; then  echo -n \-`cat .name` >> .ver1; fi
+   @LANG=C echo ' '`date` >> .ver1
+   @echo \#define UTS_VERSION \"`cat .ver1 | $(uts_truncate)`\" > .ver
+   @LANG=C echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver
    @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver
-   @echo \#define LINUX_COMPILE_HOST \"`hostname`\" >> .ver
-   @if [ -x /bin/dnsdomainname ]; then \
-      echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname`\"; \
-    elif [ -x /bin/domainname ]; then \
-      echo \#define LINUX_COMPILE_DOMAIN \"`domainname`\"; \
-    else \
-      echo \#define LINUX_COMPILE_DOMAIN ; \
-    fi >> .ver
+   @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver
+   @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \
+    ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \
+    echo > .ver1
+   @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver
    @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver
    @mv -f .ver $@
+   @rm -f .ver1
 
 include/linux/version.h: ./Makefile
+   @expr length "$(KERNELRELEASE)" \<= $(uts_len) > /dev/null || \
+     (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
    @echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
    @echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
    @echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver
@@ -336,15 +358,18 @@
    $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/v+
ersion.o init/version.c
 
 init/main.o: init/main.c include/config/MARKER
-   $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
+   $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
+
+init/do_mounts.o: init/do_mounts.c include/config/MARKER
+   $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
 
 fs lib mm ipc kernel drivers net: dummy
    $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
 
 TAGS: dummy
-   etags `find include/asm-$(ARCH) -name '*.h'`
-   find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a
-   find $(SUBDIRS) init -name '*.[ch]' | xargs etags -a
+   { 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 -
 
 # Exuberant ctags works better with -I
 tags: dummy
@@ -452,6 +477,11 @@
 htmldocs: sgmldocs
    $(MAKE) -C Documentation/DocBook html
 
+mandocs:
+   chmod 755 $(TOPDIR)/scripts/kernel-doc
+   chmod 755 $(TOPDIR)/scripts/split-man
+   $(MAKE) -C Documentation/DocBook man
+
 sums:
    find . -type f -print | sort | xargs sum > .SUMS