diff -u --recursive --new-file linux-2.0.39/CREDITS linux-2.0.40/CREDITS
--- linux-2.0.39/CREDITS	Fri Dec 15 04:12:28 2000
+++ linux-2.0.40/CREDITS	Sat Feb 24 02:31:44 2001
@@ -3,7 +3,7 @@
 	formatted in a format that allows for easy grepping and
 	beautification by scripts.  The fields are: name (N), email (E),
 	web-address (W), PGP key ID and fingerprint (P), description (D)
-	and snail-mail address (S). 
+	and snail-mail address (S).
 	Thanks,
 
 			Linus
@@ -263,7 +263,7 @@
 E: jjo@mendoza.gov.ar
 D: Network driver alias support
 D: IP masq hashing and app modules
-D: IP ip_dynaddr bits 
+D: IP ip_dynaddr bits
 S: Las Cuevas 2385 - Bo Guemes
 S: Las Heras, Mendoza CP 5539
 S: Argentina
@@ -513,7 +513,7 @@
 N: Paul Gortmaker
 E: p_gortmaker@yahoo.com
 D: Real Time Clock driver author.
-D: 8390 net driver hacker (ne2000, wd8013, smc-ultra, 3c503, etc.) 
+D: 8390 net driver hacker (ne2000, wd8013, smc-ultra, 3c503, etc.)
 D: Ethernet-HowTo and BootPrompt-HowTo author.
 D: Added many new CONFIG options (modules, ramdisk, generic-serial, etc.)
 D: Implemented 1st "official" kernel thread (moved user bdflush to kflushd)
@@ -540,7 +540,7 @@
 W: http://www.torque.net/linux-pp.html
 D: Iomega PPA / ZIP driver
 S: 44 St. Joseph Street, Suite 506
-S: Toronto, Ontario, M4Y 2W4 
+S: Toronto, Ontario, M4Y 2W4
 S: Canada
 
 N: Danny ter Haar
@@ -717,7 +717,7 @@
 N: Bernhard Kaindl
 E: bkaindl@netway.at
 E: edv@bartelt.via.at
-D: Author of a menu based configuration tool, kmenu, which 
+D: Author of a menu based configuration tool, kmenu, which
 D: is the predecessor of 'make menuconfig' and 'make xconfig'.
 S: Tallak 95
 S: 8103 Rein
@@ -781,7 +781,7 @@
 D: IP transparent proxy support
 S: X/OS Experts in Open Systems BV
 S: Kruislaan 419
-S: 1098 VA Amsterdam 
+S: 1098 VA Amsterdam
 S: The Netherlands
 
 N: Gero Kuhlmann
@@ -922,7 +922,7 @@
 D: BOOTP support
 S: Kankovskeho 1241
 S: 182 00 Praha 8
-S: Czech Republic 
+S: Czech Republic
 
 N: John A. Martin
 E: jam@acm.org
@@ -970,7 +970,7 @@
 P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03  AB AB 15 A3 AE AD 39 7D
 D: Kernel hacker. Software watchdog daemon.
 D: Maintainer of several Debian packages
-S: Th.-Heuss-Str. 61 
+S: Th.-Heuss-Str. 61
 S: D-41812 Erkelenz
 S: Germany
 
@@ -1085,7 +1085,7 @@
 W: http://www.i-Connect.Net/~mike/
 D: Developer and maintainer of the EATA-DMA SCSI driver
 D: Co-developer EATA-PIO SCSI driver
-D: /proc/scsi and assorted other snippets 
+D: /proc/scsi and assorted other snippets
 S: Zum Schiersteiner Grund 2
 S: 55127 Mainz
 S: Germany
@@ -1131,23 +1131,23 @@
 S: Russia
 
 N: Kai Petzke
-E: wpp@marie.physik.tu-berlin.de
-W: http://physik.tu-berlin.de/~wpp
-P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38  2E 3E 31 79 C3 65 5D E1 
+E: petzke@teltarif.de
+W: http://www.teltarif.de/
+P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38  2E 3E 31 79 C3 65 5D E1
 D: Driver for Laser Magnetic Storage CD-ROM
 D: Some kernel bug fixes
 D: Port of the database Postgres
-D: "Unix fuer Jedermann" a German introduction to linux (see my web page)
-S: M"ullerstr. 69
-S: 13349 Berlin
+D: Book: "Linux verstehen und anwenden" (Hanser-Verlag)
+S: Triftstraße 55
+S: 13353 Berlin
 S: Germany
 
 N: Ken Pizzini
 E: ken@halcyon.com
 D: CDROM driver "sonycd535" (Sony CDU-535/531)
 
-N: Frederic Potter 
-E: Frederic.Potter@masi.ibp.fr 
+N: Frederic Potter
+E: Frederic.Potter@masi.ibp.fr
 D: Some PCI kernel support
 
 N: Stefan Probst
@@ -1327,7 +1327,7 @@
 E: csmall@triode.apana.org.au
 E: vk2xlz@gonzo.vk2xlz.ampr.org (packet radio)
 D: Gracilis PackeTwin device driver
-D: RSPF daemon 
+D: RSPF daemon
 S: 10 Stockalls Place
 S: Minto, NSW, 2566
 S: Australia
@@ -1440,7 +1440,7 @@
 E: tsusheng@scf.usc.edu
 D: IGMP(Internet Group Management Protocol) version 2
 S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
-S: Taipei 
+S: Taipei
 S: Taiwan 112
 S: Republic of China
 S: 24335 Delta Drive
@@ -1529,7 +1529,7 @@
 D: patches for ghostscript, worked on color 'ls', etc.
 S: 301 15th Street S.
 S: Moorhead, Minnesota 56560
-S: USA 
+S: USA
 
 N: Jos Vos
 E: jos@xos.nl
@@ -1537,7 +1537,7 @@
 D: Various IP firewall updates, ipfwadm
 S: X/OS Experts in Open Systems BV
 S: Kruislaan 419
-S: 1098 VA Amsterdam 
+S: 1098 VA Amsterdam
 S: The Netherlands
 
 N: Juergen Weigert
@@ -1628,7 +1628,7 @@
 E: R.E.Wolff@BitWizard.nl
 D: Written kmalloc/kfree
 D: Written Specialix IO8+ driver
-S: Van Bronckhorststraat 12 
+S: Van Bronckhorststraat 12
 S: 2612 XV  Delft
 S: The Netherlands
 
@@ -1688,7 +1688,7 @@
 S: France
 
 # Don't add your name here, unless you really _are_ after Marc
-# alphabetically. Leonard used to be very proud of being the 
+# alphabetically. Leonard used to be very proud of being the
 # last entry, and he'll get positively pissed if he can't even
 # be second-to-last.  (and this file really _is_ supposed to be
-# in alphabetic order) 
+# in alphabetic order)
diff -u --recursive --new-file linux-2.0.39/Documentation/cdrom/sbpcd linux-2.0.40/Documentation/cdrom/sbpcd
--- linux-2.0.39/Documentation/cdrom/sbpcd	Wed Feb  7 07:17:49 1996
+++ linux-2.0.40/Documentation/cdrom/sbpcd	Mon Sep 10 15:36:47 2001
@@ -569,11 +569,11 @@
 
 #ifdef AZT_PRIVATE_IOCTLS
 #include <linux/aztcd.h>
-#endif AZT_PRIVATE_IOCTLS
+#endif /* AZT_PRIVATE_IOCTLS */
 #ifdef SBP_PRIVATE_IOCTLS
 #include <linux/sbpcd.h>
 #include <linux/fs.h>
-#endif SBP_PRIVATE_IOCTLS
+#endif /* SBP_PRIVATE_IOCTLS */
 
 struct cdrom_tochdr hdr;
 struct cdrom_tochdr tocHdr;
@@ -591,7 +591,7 @@
 	struct cdrom_msf msf;
 	unsigned char buf[CD_FRAMESIZE_RAW];
 } azt;
-#endif AZT_PRIVATE_IOCTLS
+#endif /* AZT_PRIVATE_IOCTLS */
 int i, i1, i2, i3, j, k;
 unsigned char sequence=0;
 unsigned char command[80];
@@ -1053,7 +1053,7 @@
 			rc=ioctl(drive,CDROMAUDIOBUFSIZ,j);
 			printf("%d frames granted.\n",rc);
 			break;
-#endif SBP_PRIVATE_IOCTLS
+#endif /* SBP_PRIVATE_IOCTLS */
 		default:
 			printf("unknown command: \"%s\".\n",command);
 			break;
diff -u --recursive --new-file linux-2.0.39/MAINTAINERS linux-2.0.40/MAINTAINERS
--- linux-2.0.39/MAINTAINERS	Thu Sep  7 23:40:30 2000
+++ linux-2.0.40/MAINTAINERS	Mon Sep 10 16:45:10 2001
@@ -84,7 +84,7 @@
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
 P:	Paul Gortmaker
-M:	gpg109@rsphy1.anu.edu.au
+M:	p_gortmaker@yahoo.com
 L:	linux-net@vger.kernel.org
 S:	Maintained
 
@@ -97,20 +97,20 @@
 
 AHA152X SCSI DRIVER
 P:	Juergen E. Fischer
-M:	Juergen Fischer <fischer@et-inf.fho-emden.de>
+M:	Juergen Fischer <fischer@norbit.de>
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
 APM DRIVER
 P:	Stephen Rothwell
-M:	apm@linuxcare.com.au
+M:	sfr@canb.auug.org.au
 L:	linux-laptop@vger.kernel.org
-W:	http://linuxcare.com.au/apm/
-S:	Maintained
+W:	http://www.canb.auug.org.au/~sfr/
+S:	Supported
 
 APPLETALK NETWORK LAYER
 P:	Jay Schulist
-M:	Jay.Schulist@spacs.k12.wi.us
+M:	jschlst@samba.org
 L:	linux-atalk@netspace.org
 S:	Maintained
 
@@ -120,14 +120,6 @@
 L:	linux-net@vger.kernel.org
 S:	Maintained
 
-AX.25 DAMA SLAVE
-P:	Joerg Reuter
-M:	jreuter@poboxes.com
-W:	http://poboxes.com/jreuter/
-W:	http://qsl.net/dl1bke/
-L:	linux-hams@vger.kernel.org
-S:	Maintained
-
 AX.25 NETWORK LAYER
 P:	Matthias Welwarsky
 M:	dg2fef@afthd.tu-darmstadt.de
@@ -148,7 +140,7 @@
 
 CYCLADES ASYNC MUX DRIVER
 P:	Ivan Passos
-M:	Ivan Passos <ivan@cyclades.com>
+M:	ivan@cyclades.com
 W:	http://www.cyclades.com/
 S:	Supported
 
@@ -158,6 +150,14 @@
 L:	linux-raid@vger.kernel.org
 S:	Maintained
 
+DAMA SLAVE for AX.25
+P:	Joerg Reuter
+M:	jreuter@yaina.de
+W:	http://yaina.de/jreuter/
+W:	http://qsl.net/dl1bke/
+L:	linux-hams@vger.kernel.org
+S:	Maintained
+
 DC390/AM53C974 SCSI driver
 P:	Kurt Garloff
 M:	kurt@garloff.de
@@ -176,19 +176,20 @@
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 
-DIGIBOARD DRIVER
-P:	Christoph Lameter
-M:	clameter@fuller.edu
-L:	digiboard@list.fuller.edu
-S:	Maintained
-
 DIGI RIGHTSWITCH NETWORK DRIVER
 P:	Rick Richardson
-M:	rick@dgii.com
+M:	rick@remotepoint.com
 L:	linux-net@vger.kernel.org
 W:	http://www.dgii.com/linux/
 S:	Maintained
 
+DIGIBOARD DRIVER
+P:	Christoph Lameter
+M:	clameter@fuller.edu
+W:	http://www.dgii.com/linux,http://lameter.com/digi
+L:	digilnux@dgii.com
+S:	Maintained
+
 EATA-DMA SCSI DRIVER
 P:	Michael Neuffer
 M:	mike@i-Connect.Net
@@ -197,7 +198,7 @@
 
 EATA ISA/EISA/PCI SCSI DRIVER
 P:	Dario Ballabio
-M:	dario@milano.europe.dg.com
+M:	ballabio_dario@emc.com
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
@@ -259,8 +260,11 @@
 IDE DRIVER [GENERAL]
 P:	Andre Hedrick
 M:	andre@linux-ide.org
+M:	andre@aslab.com
+M:	andre@suse.com
 L:	linux-kernel@vger.kernel.org
-W:	http://linux.kernel.org/pub/linux/kernel/people/hedrick/
+W:	http://www.kernel.org/pub/linux/kernel/people/hedrick/
+W:	http://www.linux-ide.org/
 S:	Supported
 
 IDE/ATAPI CDROM DRIVER 
@@ -297,7 +301,9 @@
 
 ISDN SUBSYSTEM HISAX
 P:	Karsten Keil
-M:	keil@isdn4linux.de
+M:	kkeil@suse.de
+P:	Kai Germaschewski
+M:	kai.germaschewski@gmx.de
 L:	isdn4linux@listserv.isdn4linux.de
 W:	http://www.isdn4linux.de
 S:	Maintained
@@ -314,6 +320,13 @@
 L:	linux-net@vger.kernel.org
 S:	Maintained
 
+MCA-SUPPORT
+P:	David Weinehall
+M:	tao@acc.umu.se
+W:	http://www.acc.umu.se/~tao/
+L:	linux-kernel@vger.kernel.org
+S:	Maintained
+
 MENUCONFIG
 P:	William Roadcap
 M:	roadcapw@titus.org
@@ -427,16 +440,13 @@
 L:	linux-video@atrey.karlin.mff.cuni.cz
 S:	Maintained
 
-THE V2.0 KERNEL IN GENERAL
-P:	David Weinehall
-M:	tao@acc.umu.se
-L:	linux-kernel@vger.kernel.org
-S:	Maintained
-
 TLAN NETWORK DRIVER
 P:	Torben Mathiasen
 M:	torben.mathiasen@compaq.com
+M:	torben@kernel.dk
 L:	tlan@vuser.vu.union.edu
+L:	linux-net@vger.kernel.org
+W:	http://tlan.kernel.dk
 S:	Maintained
 
 TOKEN-RING NETWORK DRIVER
@@ -448,13 +458,13 @@
 
 U14-34F SCSI DRIVER
 P:	Dario Ballabio
-M:	dario@milano.europe.dg.com
+M:	ballabio_dario@emc.com
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
 VFAT FILESYSTEM
 P:	Gordon Chaffee
-M:	chaffee@plateau.cs.berkeley.edu
+M:	chaffee@cs.berkeley.edu
 L:	linux-kernel@vger.kernel.org
 W:	http://bmrc.berkeley.edu/people/chaffee
 S:	Maintained
@@ -473,12 +483,14 @@
 
 Z8530 SCC DRIVER FOR AX.25
 P:	Joerg Reuter
-M:	jreuter@poboxes.com
-W:	http://poboxes.com/jreuter/
-W:	http://qsl.net/dl1bke/
+M:	jreuter@yaina.de
+W:	http://yaina.de/jreuter/
+W:	http://www.qsl.net/dl1bke/
 L:	linux-hams@vger.kernel.org
 S:	Maintained
 
 THE REST
-P:	Linus Torvalds
-S:	Buried alive in email
+P:	David Weinehall
+M:	tao@acc.umu.se
+L:	linux-kernel@vger.kernel.org
+S:	Maintained
diff -u --recursive --new-file linux-2.0.39/Makefile linux-2.0.40/Makefile
--- linux-2.0.39/Makefile	Wed Dec 15 12:22:10 1999
+++ linux-2.0.40/Makefile	Fri Aug 10 18:15:29 2001
@@ -1,6 +1,9 @@
 VERSION = 2
 PATCHLEVEL = 0
-SUBLEVEL = 39
+SUBLEVEL = 40
+EXTRAVERSION =-pre1
+
+KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
@@ -185,6 +188,9 @@
 symlinks:
 	rm -f include/asm
 	( cd include ; ln -sf asm-$(ARCH) asm)
+	@if [ ! -d include/linux/modules ]; then \
+		mkdir include/linux/modules; \
+	fi
 
 oldconfig: symlinks
 	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
@@ -236,8 +242,9 @@
 	@mv -f .ver $@
 
 include/linux/version.h: ./Makefile
-	@echo \#define UTS_RELEASE \"$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)\" > .ver
+	@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
 	@mv -f .ver $@
 
 init/version.o: init/version.c include/linux/compile.h
@@ -267,6 +274,18 @@
 net: dummy
 	$(MAKE) linuxsubdirs SUBDIRS=net
 
+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 '*.c' | xargs etags -a
+
+# Exuberant ctags works better with -I
+tags: dummy
+	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 '*.c' | xargs ctags $$CTAGSF -a
+
 MODFLAGS = -DMODULE
 ifdef CONFIG_MODULES
 ifdef CONFIG_MODVERSIONS
@@ -345,7 +364,7 @@
 distclean: mrproper
 	rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
                 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-                -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -print` TAGS
+                -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -print` TAGS tags
 
 backup: mrproper
 	cd .. && tar cf - linux/ | gzip -9 > backup.gz
@@ -377,7 +396,13 @@
 depend dep: dep-files $(MODVERFILE)
 
 checkconfig:
-	perl -w scripts/checkconfig.pl `find * -name '*.[hcS]' -print | sort`
+	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
 
 ifdef CONFIGURATION
 ..$(CONFIGURATION):
diff -u --recursive --new-file linux-2.0.39/arch/i386/kernel/head.S linux-2.0.40/arch/i386/kernel/head.S
--- linux-2.0.39/arch/i386/kernel/head.S	Thu Aug 26 00:08:27 1999
+++ linux-2.0.40/arch/i386/kernel/head.S	Mon Sep 10 15:36:02 2001
@@ -51,7 +51,7 @@
 	jmp checkCPUtype
 1:
 	lss stack_start,%esp
-#endif __SMP__
+#endif /* __SMP__ */
 /*
  * Clear BSS first so that there are no surprises...
  */
diff -u --recursive --new-file linux-2.0.39/arch/i386/kernel/setup.c linux-2.0.40/arch/i386/kernel/setup.c
--- linux-2.0.39/arch/i386/kernel/setup.c	Sun Jun 13 19:21:00 1999
+++ linux-2.0.40/arch/i386/kernel/setup.c	Wed Sep 12 15:03:39 2001
@@ -57,10 +57,10 @@
 static const char *x86_clkmult[] = {
 	"unknown", "1", "1.5", "2", "2.5", "3", "3.5", "4", "4.5", "5", "5.5",
 	"6", "6.5", "7", "7.5", "8"
-	};
+};
 
 char ignore_irq13 = 0;		/* set if exception 16 works */
-char wp_works_ok = -1;		/* set if paging hardware honours WP */ 
+char wp_works_ok = -1;		/* set if paging hardware honours WP */
 char hlt_works_ok = 1;		/* set if the "hlt" instruction works */
 
 /*
@@ -112,9 +112,9 @@
 #define COMMAND_LINE ((char *) (PARAM+2048))
 #define COMMAND_LINE_SIZE 256
 
-#define RAMDISK_IMAGE_START_MASK  	0x07FF
+#define RAMDISK_IMAGE_START_MASK	0x07FF
 #define RAMDISK_PROMPT_FLAG		0x8000
-#define RAMDISK_LOAD_FLAG		0x4000	
+#define RAMDISK_LOAD_FLAG		0x4000
 
 static char command_line[COMMAND_LINE_SIZE] = { 0, };
        char saved_command_line[COMMAND_LINE_SIZE];
@@ -136,9 +136,9 @@
 	}
 	smptrap=1;
 
- 	ROOT_DEV = to_kdev_t(ORIG_ROOT_DEV);
- 	drive_info = DRIVE_INFO;
- 	screen_info = SCREEN_INFO;
+	ROOT_DEV = to_kdev_t(ORIG_ROOT_DEV);
+	drive_info = DRIVE_INFO;
+	screen_info = SCREEN_INFO;
 #ifdef CONFIG_APM
 	apm_bios_info = APM_BIOS_INFO;
 #endif
@@ -167,14 +167,14 @@
 	/*
 	 *	The CONFIG_MAX_MEMSIZE sanity checker.
 	 */
-	 
+
 	if (memory_end > (CONFIG_MAX_MEMSIZE-128)*1024*1024)
 	{
 		memory_end = (CONFIG_MAX_MEMSIZE-128)*1024*1024;
 		printk(KERN_WARNING "ONLY %dMB RAM will be used, see Documentation/more-than-900MB-RAM.txt!.\n", CONFIG_MAX_MEMSIZE-128);
 		udelay(3*1000*1000);
 	}
-	
+
 	if (!MOUNT_ROOT_RDONLY)
 		root_mountflags &= ~MS_RDONLY;
 	memory_start = (unsigned long) &_end;
@@ -263,12 +263,12 @@
     unsigned char nr6x86 = 0;
     unsigned char cx_dir0 = 0;	/* Model and bus clock multiplier */
     unsigned char cx_dir1 = 0;	/* Stepping info */
-    unsigned int flags;
+    unsigned long flags;
     static const char *model[] = {
 	"unknown", "Cx486", "5x86", "MediaGX", "6x86", "6x86L", "6x86MX",
 	"M II"
     };
-    
+
     if (x86_model == -1) {	/* is this an old Cx486 without DIR0/DIR1? */
 	nr6x86 = 1;		/* Cx486 */
 	Cx86_mult = 0;		/* unknown multiplier */
@@ -276,65 +276,65 @@
     else {
 
 	/* Get DIR0, DIR1 since all other Cyrix CPUs have them */
-    
+
 	save_flags(flags);
 	cli();
 	cx_dir0 = getCx86(CX86_DIR0);	/* we use the access macros */
 	cx_dir1 = getCx86(CX86_DIR1);	/* defined in processor.h */
 	restore_flags(flags);
-	                                
+
 	/* Now cook; the recipe is by Channing Corn, from Cyrix.
 	 * We do the same thing for each generation: we work out
 	 * the model, multiplier and stepping.
 	 */
-	 
+
 	if (cx_dir0 < 0x20) {
 		nr6x86 = 1;				/* Cx486 */
 		Cx86_mult = 0;				/* unknown multiplier */
 		sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 4) + 1, cx_dir1 & 0x0f);
 	}
-        
+
         if ((cx_dir0 > 0x20) && (cx_dir0 < 0x30)) {
 		nr6x86 = 2;				/* 5x86 */
 		Cx86_mult = ((cx_dir0 & 0x04) ? 5 : 3);	/* either 3x or 2x */
 		sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 4) + 1, cx_dir1 & 0x0f);
 	}
-        
+
         if ((cx_dir0 >= 0x30) && (cx_dir0 < 0x38)) {
 		nr6x86 = ((x86_capability & (1 << 8)) ? 5 : 4);	/* 6x86(L) */
 		Cx86_mult = ((cx_dir0 & 0x04) ? 5 : 3);	/* either 3x or 2x */
 		sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 3), cx_dir1 & 0x0f);
 	}
-        
+
         if ((cx_dir0 >= 0x40) && (cx_dir0 < 0x50)) {
 	    if (x86 == 4) { /* MediaGX */
 		nr6x86 = 3;
 		Cx86_mult = ((cx_dir0 & 0x01) ? 5 : 7);	/* either 3x or 4x */
-        	switch (cx_dir1 >> 4) {
-            		case (0) :
-            		case (1) :
-            			sprintf(Cx86_step, "2.%d", cx_dir1 & 0x0f);
-			break;
-            		case (2) :
-            			sprintf(Cx86_step, "1.%d", cx_dir1 & 0x0f);
-			break;
+		switch (cx_dir1 >> 4) {
+			case (0) :
+			case (1) :
+				sprintf(Cx86_step, "2.%d", cx_dir1 & 0x0f);
+				break;
+			case (2) :
+				sprintf(Cx86_step, "1.%d", cx_dir1 & 0x0f);
+				break;
                         default  :
-			break;
+				break;
                 }
             } /* endif MediaGX */
-            if (x86 == 5) { /* GXm */
-                char GXm_mult[8] = {7,11,7,11,13,15,13,9}; /* 4 to 8 */
-            	ext_cpuid = 0x80000005;	/* available */
-            	Cx86_mult = GXm_mult[cx_dir0 & 0x0f];
-            	sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 4) - 1, cx_dir1 & 0x0f);
-            } /* endif GXm */
+	    if (x86 == 5) { /* GXm */
+		    char GXm_mult[8] = {7,11,7,11,13,15,13,9}; /* 4 to 8 */
+		    ext_cpuid = 0x80000005;	/* available */
+		    Cx86_mult = GXm_mult[cx_dir0 & 0x0f];
+		    sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 4) - 1, cx_dir1 & 0x0f);
+	    } /* endif GXm */
         }
-        
+
         if ((cx_dir0 >= 0x50) && (cx_dir0 < 0x60)) {
 		nr6x86 = ((cx_dir1 > 7) ? 7 : 6);	/* 6x86Mx or M II */
 		Cx86_mult = (cx_dir0 & 0x07) + 2;	/* 2 to 5 in 0.5 steps */
-        	if (((cx_dir1 & 0x0f) > 4) || ((cx_dir1 >> 4) == 2)) cx_dir1 += 0x10;
-        	sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 4) + 1, cx_dir1 & 0x0f);
+		if (((cx_dir1 & 0x0f) > 4) || ((cx_dir1 >> 4) == 2)) cx_dir1 += 0x10;
+		sprintf(Cx86_step, "%d.%d", (cx_dir1 >> 4) + 1, cx_dir1 & 0x0f);
 	}
     }
     x86_mask = 1;	/* we don't use it, but has to be set to something */
@@ -358,7 +358,7 @@
 {
 	const char *p=NULL;
 	int i;
-	
+
 	if ((x86_model == 0) || (x86 == 4)) {
 		for (i=0; i<sizeof(amd_models)/sizeof(struct cpu_model_info); i++)
 			if (amd_models[i].cpu_x86 == x86) {
@@ -390,31 +390,30 @@
 {
 	const char *p = "386 SX/DX";	/* default to a 386 */
 	int i;
-	
+
 	/*
 	 *	Old 486SX has no CPU ID. Set the model to 2 for this
 	 *	case.
 	 */
-	 
+
 	if( x86==4 && x86_model == 0 && hard_math == 0)
 		x86_model = 2;
-	
+
 	for (i=0; i<sizeof(intel_models)/sizeof(struct cpu_model_info); i++)
 		if (intel_models[i].cpu_x86 == x86) {
 			p = intel_models[i].model_names[(int)x86_model];
 			break;
 		}
-	
-	
+
 	return p;
 }
-	
+
 /* Recent Intel CPUs have an EEPROM and a ROM with CPU information. We'll use
  * this information in future versions of this code.
  * AMD and more recently Cyrix have decided to standardize on an extended
  * cpuid mechanism for their CPUs.
  */
- 
+
 static const char * get_cpu_mkt_name(void)
 {
         static char mktbuf[48];
@@ -439,7 +438,7 @@
 	else if (strcmp(x86_vendor_id, "CentaurHauls") == 0)	/* CentaurHauls */
 		p = IDTmodel();
 	/* This isnt quite right */
-	else if (strcmp(x86_vendor_id, "UMC UMC UMC ") == 0) 	/* UMC */
+	else if (strcmp(x86_vendor_id, "UMC UMC UMC ") == 0)	/* UMC */
 		p = Intelmodel();
 	else /* default - this could be anyone */
 		p = Intelmodel();
@@ -464,7 +463,7 @@
 		"fpcmov", "17", "psn",    "19",  "20",  "21", "22",   "mmx",
 		  "emmx", "25", "26",    "27",  "28",  "29", "30", "3dnow"
 	};
-         
+
 #ifdef __SMP__
         int n;
 
@@ -475,7 +474,7 @@
 
         for ( n = 0 ; n < 32 ; n++ ) {
                 if ( cpu_present_map & (1<<n) ) {
-                        if (len) buffer[len++] = '\n'; 
+                        if (len) buffer[len++] = '\n';
 
 #else
 #define CD(X) (X)
@@ -491,28 +490,28 @@
 			len += sprintf(buffer+len,
                                        "\nvendor_id\t: %s\n",
                                        x86_vendor_id);
-        
+
                         if (CD(x86_mask) || have_cpuid)
-                                if      ((strncmp(x86_vendor_id, "Au", 2) == 0)
-                                	&& (x86_model >= 6)) {
-                                	len += sprintf(buffer+len,
-                                        	       "stepping\t: %c\n",
-                                             	       x86_mask + 'A');
+                                if ((strncmp(x86_vendor_id, "Au", 2) == 0)
+					&& (x86_model >= 6)) {
+					len += sprintf(buffer+len,
+							"stepping\t: %c\n",
+							x86_mask + 'A');
                                 }
                                 else if (strncmp(x86_vendor_id, "Cy", 2) == 0) {
-                                	len += sprintf(buffer+len,
+					len += sprintf(buffer+len,
 							"stepping\t: %s, core/bus clock ratio: %sx\n",
-                              				Cx86_step, x86_clkmult[Cx86_mult]);
+							Cx86_step, x86_clkmult[Cx86_mult]);
                                 }
-                                else { 	
-                                	len += sprintf(buffer+len,
-                                        	       "stepping\t: %d\n",
-                                             	       CD(x86_mask));
+                                else {
+					len += sprintf(buffer+len,
+						       "stepping\t: %d\n",
+						       CD(x86_mask));
                                 }
                         else
-                                len += sprintf(buffer+len, 
+                                len += sprintf(buffer+len,
                                                "stepping\t: unknown\n");
-        
+
                         len += sprintf(buffer+len,
                                        "fdiv_bug\t: %s\n"
                                        "hlt_bug\t\t: %s\n"
@@ -530,7 +529,7 @@
                                          ? "yes" : "no",
                                        CD(have_cpuid) ? "yes" : "no",
                                        CD(wp_works_ok) ? "yes" : "no");
-        
+
                         for ( i = 0 ; i < 32 ; i++ ) {
                                 if ( CD(x86_capability) & (1 << i) ) {
                                         len += sprintf(buffer+len, " %s",
diff -u --recursive --new-file linux-2.0.39/arch/i386/kernel/traps.c linux-2.0.40/arch/i386/kernel/traps.c
--- linux-2.0.39/arch/i386/kernel/traps.c	Sun Nov 15 19:32:46 1998
+++ linux-2.0.40/arch/i386/kernel/traps.c	Mon Sep 10 18:12:58 2001
@@ -61,19 +61,22 @@
 
 #define get_seg_byte(seg,addr) ({ \
 register unsigned char __res; \
-__asm__("push %%fs;mov %%ax,%%fs;movb %%fs:%2,%%al;pop %%fs" \
-	:"=a" (__res):"0" (seg),"m" (*(addr))); \
+__asm__("push %%fs; mov %%ax, %%fs; movb %%fs:%2, %%al; pop %%fs" \
+	: "=a" (__res)
+	: "0" (seg), "m" (*(addr))); \
 __res;})
 
 #define get_seg_long(seg,addr) ({ \
 register unsigned long __res; \
-__asm__("push %%fs;mov %%ax,%%fs;movl %%fs:%2,%%eax;pop %%fs" \
-	:"=a" (__res):"0" (seg),"m" (*(addr))); \
+__asm__("push %%fs; mov %%ax, %%fs; movl %%fs:%2, %%eax; pop %%fs" \
+	: "=a" (__res)
+	: "0" (seg), "m" (*(addr))); \
 __res;})
 
 #define _fs() ({ \
 register unsigned short __res; \
-__asm__("mov %%fs,%%ax":"=a" (__res):); \
+__asm__("mov %%fs, %%ax"
+	: "=a" (__res):); \
 __res;})
 
 void page_exception(void);
@@ -219,12 +222,12 @@
 			}
 			do_exit(SIGSEGV);
 		}
-		else 
+		else
 			die_if_kernel("general protection",regs,error_code);
 	}
 	current->tss.error_code = error_code;
 	current->tss.trap_no = 13;
-	force_sig(SIGSEGV, current);	
+	force_sig(SIGSEGV, current);
 }
 
 asmlinkage void do_nmi(struct pt_regs * regs, long error_code)
@@ -236,7 +239,7 @@
 	printk("Uhhuh. NMI received. Dazed and confused, but trying to continue\n");
 	printk("You probably have a hardware problem with your RAM chips or a\n");
 	printk("power saving mode enabled.\n");
-#endif	
+#endif
 #endif
 }
 
@@ -251,7 +254,7 @@
 	current->tss.error_code = error_code;
 	if ((regs->cs & 3) == 0) {
 		/* If this is a kernel mode trap, then reset db7 and allow us to continue */
-		__asm__("movl %0,%%db7"
+		__asm__("movl %0, %%db7"
 			: /* no output */
 			: "r" (0));
 		return;
@@ -282,7 +285,8 @@
 	/*
 	 *	Save the info for the exception handler
 	 */
-	__asm__ __volatile__("fnsave %0":"=m" (task->tss.i387.hard));
+	__asm__ __volatile__("fnsave %0"
+		: "=m" (task->tss.i387.hard));
 	task->flags&=~PF_USEDFPU;
 	stts();
 
@@ -329,14 +333,17 @@
 	if (last_task_used_math == current)
 		return;
 	if (last_task_used_math)
-		__asm__("fnsave %0":"=m" (last_task_used_math->tss.i387));
+		__asm__("fnsave %0"
+			: "=m" (last_task_used_math->tss.i387));
 	else
 		__asm__("fnclex");
 	last_task_used_math = current;
 #endif
 
 	if(current->used_math)
-		__asm__("frstor %0": :"m" (current->tss.i387));
+		__asm__("frstor %0"
+			:
+			: "m" (current->tss.i387));
 	else
 	{
 		/*
@@ -398,7 +405,8 @@
 	flush_tlb_all();
 
 		/* now we have the mapping ok, we can do LIDT */
-	 __asm__ __volatile__("\tlidt %0": "=m" (idt_descriptor));
+	 __asm__ __volatile__("\tlidt %0"
+		: "=m" (idt_descriptor));
 
 	printk(" ... done\n");
 }
@@ -409,10 +417,10 @@
 	int i;
 	struct desc_struct * p;
 	static int smptrap=0;
-	
+
 	if(smptrap)
 	{
-		__asm__("pushfl ; andl $0xffffbfff,(%esp) ; popfl");
+		__asm__("pushfl; andl $0xffffbfff, (%esp); popfl");
 		load_ldt(0);
 		return;
 	}
@@ -454,7 +462,7 @@
 		p++;
 	}
 /* Clear NT, so that we won't have troubles with that later on */
-	__asm__("pushfl ; andl $0xffffbfff,(%esp) ; popfl");
+	__asm__("pushfl; andl $0xffffbfff, (%esp); popfl");
 	load_TR(0);
 	load_ldt(0);
 }
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/control_w.h linux-2.0.40/arch/i386/math-emu/control_w.h
--- linux-2.0.39/arch/i386/math-emu/control_w.h	Thu Jun 29 17:25:27 1995
+++ linux-2.0.40/arch/i386/math-emu/control_w.h	Thu Aug 23 18:56:18 2001
@@ -42,4 +42,4 @@
 /* FULL_PRECISION simulates all exceptions masked */
 #define FULL_PRECISION  (PR_64_BITS | RC_RND | 0x3f)
 
-#endif _CONTROLW_H_
+#endif /* _CONTROLW_H_ */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/div_Xsig.S linux-2.0.40/arch/i386/math-emu/div_Xsig.S
--- linux-2.0.39/arch/i386/math-emu/div_Xsig.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/div_Xsig.S	Mon Sep 10 15:35:51 2001
@@ -70,7 +70,7 @@
 	.long	0
 FPU_result_1:
 	.long	0
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 
 .text
@@ -79,7 +79,7 @@
 	movl	%esp,%ebp
 #ifndef NON_REENTRANT_FPU
 	subl	$28,%esp
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 	pushl	%esi
 	pushl	%edi
@@ -91,7 +91,7 @@
 #ifdef PARANOID
 	testl	$0x80000000, XsigH(%ebx)	/* Divisor */
 	je	L_bugged
-#endif PARANOID
+#endif /* PARANOID */
 
 
 /*---------------------------------------------------------------------------+
@@ -164,7 +164,7 @@
 
 #ifdef PARANOID
 	jb	L_bugged_1
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* need to subtract another once of the denom */
 	incl	FPU_result_3	/* Correct the answer */
@@ -177,7 +177,7 @@
 #ifdef PARANOID
 	sbbl	$0,FPU_accum_3
 	jne	L_bugged_1	/* Must check for non-zero result here */
-#endif PARANOID
+#endif /* PARANOID */
 
 /*----------------------------------------------------------------------*/
 /* Half of the main problem is done, there is just a reduced numerator
@@ -207,7 +207,7 @@
 
 #ifdef PARANOID
 	je	L_bugged_2	/* Can't bump the result to 1.0 */
-#endif PARANOID
+#endif /* PARANOID */
 
 LDo_2nd_div:
 	cmpl	$0,%ecx		/* augmented denom msw */
@@ -230,7 +230,7 @@
 
 #ifdef PARANOID
 	jc	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	movl	FPU_result_2,%eax	/* Get the result back */
 	mull	XsigL(%ebx)	/* now mul the ls dw of the denom */
@@ -241,14 +241,14 @@
 
 #ifdef PARANOID
 	jc	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	jz	LDo_3rd_32_bits
 
 #ifdef PARANOID
 	cmpl	$1,FPU_accum_2
 	jne	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* need to subtract another once of the denom */
 	movl	XsigL(%ebx),%eax
@@ -260,14 +260,14 @@
 #ifdef PARANOID
 	jc	L_bugged_2
 	jne	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	addl	$1,FPU_result_2	/* Correct the answer */
 	adcl	$0,FPU_result_3
 
 #ifdef PARANOID
 	jc	L_bugged_2	/* Must check for non-zero result here */
-#endif PARANOID
+#endif /* PARANOID */
 
 /*----------------------------------------------------------------------*/
 /* The division is essentially finished here, we just need to perform
@@ -362,4 +362,4 @@
 	call	EXCEPTION
 	pop	%ebx
 	jmp	L_exit
-#endif PARANOID
+#endif /* PARANOID */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/errors.c linux-2.0.40/arch/i386/math-emu/errors.c
--- linux-2.0.39/arch/i386/math-emu/errors.c	Mon May  6 15:31:17 1996
+++ linux-2.0.40/arch/i386/math-emu/errors.c	Thu Aug 23 18:57:00 2001
@@ -141,7 +141,7 @@
 if ( partial_status & SW_Zero_Div )    printk("SW: divide by zero\n");
 if ( partial_status & SW_Denorm_Op )   printk("SW: denormalized operand\n");
 if ( partial_status & SW_Invalid )     printk("SW: invalid operation\n");
-#endif DEBUGGING
+#endif /* DEBUGGING */
 
   printk(" SW: b=%d st=%ld es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n",
 	 partial_status & 0x8000 ? 1 : 0,   /* busy */
@@ -328,7 +328,7 @@
 #ifdef PRINT_MESSAGES
       /* My message from the sponsor */
       printk(FPU_VERSION" "__DATE__" (C) W. Metzenthen.\n");
-#endif PRINT_MESSAGES
+#endif /* PRINT_MESSAGES */
       
       /* Get a name string for error reporting */
       for (i=0; exception_names[i].type; i++)
@@ -339,7 +339,7 @@
 	{
 #ifdef PRINT_MESSAGES
 	  printk("FP Exception: %s!\n", exception_names[i].name);
-#endif PRINT_MESSAGES
+#endif /* PRINT_MESSAGES */
 	}
       else
 	printk("FPU emulator: Unknown Exception: 0x%04x!\n", n);
@@ -352,7 +352,7 @@
 #ifdef PRINT_MESSAGES
       else
 	emu_printall();
-#endif PRINT_MESSAGES
+#endif /* PRINT_MESSAGES */
 
       /*
        * The 80486 generates an interrupt on the next non-control FPU
@@ -364,7 +364,7 @@
 
 #ifdef __DEBUG__
   math_abort(FPU_info,SIGFPE);
-#endif __DEBUG__
+#endif /* __DEBUG__ */
 
 }
 
@@ -397,7 +397,7 @@
   else
 #ifdef PARANOID
     if (b->tag == TW_NaN)
-#endif PARANOID
+#endif /* PARANOID */
     {
       signalling = !(b->sigh & 0x40000000);
       x = b;
@@ -409,7 +409,7 @@
       EXCEPTION(EX_INTERNAL|0x113);
       x = &CONST_QNaN;
     }
-#endif PARANOID
+#endif /* PARANOID */
 
   if ( !signalling )
     {
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/exception.h linux-2.0.40/arch/i386/math-emu/exception.h
--- linux-2.0.39/arch/i386/math-emu/exception.h	Sat Mar 29 01:12:25 1997
+++ linux-2.0.40/arch/i386/math-emu/exception.h	Thu Aug 23 18:57:14 2001
@@ -18,7 +18,7 @@
 
 #ifndef SW_C1
 #include "fpu_emu.h"
-#endif SW_C1
+#endif /* SW_C1 */
 
 #define FPU_BUSY        Const_(0x8000)   /* FPU busy bit (8087 compatibility) */
 #define EX_ErrorSummary Const_(0x0080)   /* Error summary status */
@@ -48,6 +48,6 @@
 #define	EXCEPTION(x)	exception(x)
 #endif
 
-#endif __ASSEMBLY__
+#endif /* __ASSEMBLY__ */
 
-#endif _EXCEPTION_H_
+#endif /* _EXCEPTION_H_ */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/fpu_asm.h linux-2.0.40/arch/i386/math-emu/fpu_asm.h
--- linux-2.0.39/arch/i386/math-emu/fpu_asm.h	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/fpu_asm.h	Thu Aug 23 18:57:19 2001
@@ -28,4 +28,4 @@
 #define	SIGL(x)	SIGL_OFFSET##(x)
 #define	SIGH(x)	12(x)
 
-#endif _FPU_ASM_H_
+#endif /* _FPU_ASM_H_ */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/fpu_emu.h linux-2.0.40/arch/i386/math-emu/fpu_emu.h
--- linux-2.0.39/arch/i386/math-emu/fpu_emu.h	Sun Sep 22 09:13:54 1996
+++ linux-2.0.40/arch/i386/math-emu/fpu_emu.h	Thu Aug 23 18:57:36 2001
@@ -73,7 +73,7 @@
 #else
 #  define RE_ENTRANT_CHECK_OFF
 #  define RE_ENTRANT_CHECK_ON
-#endif RE_ENTRANT_CHECKING
+#endif /* RE_ENTRANT_CHECKING */
 
 #define FWAIT_OPCODE 0x9b
 #define OP_SIZE_PREFIX 0x66
@@ -168,6 +168,6 @@
 #include "fpu_proto.h"
 #endif
 
-#endif __ASSEMBLY__
+#endif /* __ASSEMBLY__ */
 
-#endif _FPU_EMU_H_
+#endif /* _FPU_EMU_H_ */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/fpu_entry.c linux-2.0.40/arch/i386/math-emu/fpu_entry.c
--- linux-2.0.39/arch/i386/math-emu/fpu_entry.c	Mon May  6 15:31:17 1996
+++ linux-2.0.40/arch/i386/math-emu/fpu_entry.c	Mon Sep 10 17:56:53 2001
@@ -77,7 +77,7 @@
   fdivr_,   trig_b,  __BAD__, __BAD__, fdiv_i,  __BAD__, fdivp_,  __BAD__,
 };
 
-#endif NO_UNDOC_CODE
+#endif /* NO_UNDOC_CODE */
 
 
 #define _NONE_ 0   /* Take no special action */
@@ -119,12 +119,12 @@
   _REGI_, _NONE_, _null_, _null_, _REGIi, _null_, _REGIp, _null_
 };
 
-#endif NO_UNDOC_CODE
+#endif /* NO_UNDOC_CODE */
 
 
 #ifdef RE_ENTRANT_CHECKING
 char emulating=0;
-#endif RE_ENTRANT_CHECKING
+#endif /* RE_ENTRANT_CHECKING */
 
 static int valid_prefix(unsigned char *Byte, unsigned char **fpu_eip,
 			overrides *override);
@@ -151,7 +151,7 @@
       printk("ERROR: wm-FPU-emu is not RE-ENTRANT!\n");
     }
   RE_ENTRANT_CHECK_ON;
-#endif RE_ENTRANT_CHECKING
+#endif /* RE_ENTRANT_CHECKING */
 
   if (!current->used_math)
     {
@@ -259,7 +259,7 @@
 #ifdef PARANOID
       EXCEPTION(EX_INTERNAL|0x128);
       math_abort(FPU_info,SIGILL);
-#endif PARANOID
+#endif /* PARANOID */
     }
 
   RE_ENTRANT_CHECK_OFF;
@@ -387,7 +387,7 @@
 			real_2op_NaN(&loaded_data, st0_ptr,
 				     st0_ptr);
 		      else
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 			/* fadd, fdivr, fmul, or fsubr */
 			real_2op_NaN(st0_ptr, &loaded_data,
 				     st0_ptr);
@@ -500,7 +500,7 @@
 	 to do this: */
       operand_address.offset = 0;
       operand_address.selector = FPU_DS;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
       st0_ptr = &st(0);
       st0_tag = st0_ptr->tag;
@@ -560,7 +560,7 @@
   RE_ENTRANT_CHECK_OFF;
   emu_printall();
   RE_ENTRANT_CHECK_ON;
-#endif DEBUG
+#endif /* DEBUG */
 
   if (FPU_lookahead && !need_resched)
     {
@@ -669,10 +669,10 @@
 	current->tss.error_code = 0;
 	send_sig(signal,current,1);
 	RE_ENTRANT_CHECK_OFF;
-	__asm__("movl %0,%%esp ; ret": :"g" (((long) info)-4));
+	__asm__("movl %0,%%esp ; ret" : : "g" (((long) info)-4));
 #ifdef PARANOID
       printk("ERROR: wm-FPU-emu math_abort failed!\n");
-#endif PARANOID
+#endif /* PARANOID */
 }
 
 
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/fpu_etc.c linux-2.0.40/arch/i386/math-emu/fpu_etc.c
--- linux-2.0.39/arch/i386/math-emu/fpu_etc.c	Fri Aug 19 07:54:01 1994
+++ linux-2.0.40/arch/i386/math-emu/fpu_etc.c	Thu Aug 23 19:00:33 2001
@@ -60,10 +60,10 @@
 	  /* This is weird! */
 	  if (st0_ptr->sign == SIGN_POS)
 	    setcc(SW_C3);
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	  return;
 	}
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       break;
     case TW_NaN:
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/fpu_trig.c linux-2.0.40/arch/i386/math-emu/fpu_trig.c
--- linux-2.0.39/arch/i386/math-emu/fpu_trig.c	Mon Aug  1 07:19:13 1994
+++ linux-2.0.40/arch/i386/math-emu/fpu_trig.c	Thu Aug 23 19:04:34 2001
@@ -75,7 +75,7 @@
       else
 	even = 0;
     }
-#endif FPTAN
+#endif /* FPTAN */
 
   if ( (even && !(q & 1)) || (!even && (q & 1)) )
     {
@@ -105,7 +105,7 @@
 	      q++;
 	    }
 	}
-#endif BETTER_THAN_486
+#endif /* BETTER_THAN_486 */
     }
 #ifdef BETTER_THAN_486
   else
@@ -139,7 +139,7 @@
 	    }
 	}
     }
-#endif BETTER_THAN_486
+#endif /* BETTER_THAN_486 */
 
   control_word = old_cw;
   partial_status = saved_status & ~SW_C2;     /* Reduction complete. */
@@ -187,7 +187,7 @@
 #ifdef PARANOID
     default:
       EXCEPTION(EX_INTERNAL|0x0112);
-#endif PARANOID
+#endif /* PARANOID */
     }
 }
 
@@ -223,7 +223,7 @@
 #ifdef PARANOID
     default:
       EXCEPTION(EX_INTERNAL|0x0112);
-#endif PARANOID
+#endif /* PARANOID */
     }
 }
 
@@ -244,7 +244,7 @@
 #ifdef DENORM_OPERAND
 	else if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	  return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	else
 	  {
 	    /* poly_2xm1(x) requires 0 < x < 1. */
@@ -328,7 +328,7 @@
 #ifdef DENORM_OPERAND
 	      if ( denormal_operand() )
 		return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      /* A denormal result has been produced.
 		 Precision must have been lost, this is always
 		 an underflow. */
@@ -379,8 +379,8 @@
 #ifdef DENORM_OPERAND
       if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
-	  
+#endif /* DENORM_OPERAND */
+
       push();
       reg_move(st1_ptr, st_new_ptr);
       st_new_ptr->exp = EXP_BIAS;
@@ -430,7 +430,7 @@
 #ifdef PARANOID
   else
     EXCEPTION(EX_INTERNAL | 0x119);
-#endif PARANOID
+#endif /* PARANOID */
 }
 
 
@@ -465,7 +465,7 @@
 #ifdef DENORM_OPERAND
       if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       expon = st0_ptr->exp - EXP_BIAS;
       st0_ptr->exp = EXP_BIAS + (expon & 1);  /* make st(0) in  [1.0 .. 4.0) */
@@ -502,7 +502,7 @@
 #ifdef DENORM_OPERAND
       if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       /* Fortunately, this can't overflow to 2^64 */
       if ( (flags = round_to_int(st0_ptr)) )
@@ -563,7 +563,7 @@
 #ifdef DENORM_OPERAND
 	      if ( denormal_operand() )
 		return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      /* A denormal result has been produced.
 		 Precision must have been lost, this is always
 		 an underflow. */
@@ -639,7 +639,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (arg->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  setcc(0);
 	  reg_move(&CONST_1, arg);
@@ -647,7 +647,7 @@
 	  set_precision_flag_down();  /* 80486 appears to do this. */
 #else
 	  set_precision_flag_up();  /* Must be up. */
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	  return 0;
 	}
     }
@@ -780,8 +780,8 @@
       if ( ((st0_ptr->exp <= EXP_UNDER) ||
 	    (st1_ptr->exp <= EXP_UNDER)) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
-      
+#endif /* DENORM_OPERAND */
+
       /* We want the status following the denorm tests, but don't want
 	 the status changed by the arithmetic operations. */
       saved_status = partial_status;
@@ -894,7 +894,7 @@
 	      setcc(SW_C2);
 #else
 	      setcc(0);
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	      return;
 	    }
 	  cc = SW_C2;
@@ -926,7 +926,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  setcc(0); return;
 	}
@@ -947,7 +947,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  if ( st1_tag == TW_Infinity )
 	    {
@@ -970,7 +970,7 @@
 #ifdef PARANOID
   if ( (st0_tag != TW_NaN) && (st1_tag != TW_NaN) )
       EXCEPTION(EX_INTERNAL | 0x118);
-#endif PARANOID
+#endif /* PARANOID */
 
   real_2op_NaN(st1_ptr, st0_ptr, st0_ptr);
 
@@ -994,7 +994,7 @@
 	  if ( ((st0_ptr->exp <= EXP_UNDER) ||
 		(st1_ptr->exp <= EXP_UNDER)) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  if ( (st0_ptr->sigh == 0x80000000) && (st0_ptr->sigl == 0) )
 	    {
@@ -1072,7 +1072,7 @@
 	      reg_move(&CONST_INF, st1_ptr);
 	      pop();
 	    }
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	  else
 	    {
 	      if ( !divide_by_zero(st1_ptr->sign^SIGN_NEG^SIGN_POS, st1_ptr) )
@@ -1097,7 +1097,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  if ( st0_ptr->exp < EXP_BIAS ) sign ^= SIGN_NEG^SIGN_POS;
 	  pop(); st0_ptr = &st(0);
@@ -1123,7 +1123,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  pop(); st0_ptr = &st(0);
 	  reg_move(&CONST_INF, st0_ptr);
@@ -1156,7 +1156,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  st1_ptr->sign ^= SIGN_NEG;
 	  pop();
@@ -1171,7 +1171,7 @@
 	  /* This should be invalid, but a real 80486 is happy with it. */
 #ifndef PECULIAR_486
 	  if ( !divide_by_zero(st1_ptr->sign, st1_ptr) )
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	    {
 	      st1_ptr->sign ^= SIGN_NEG^SIGN_POS;
 	      pop();
@@ -1201,7 +1201,7 @@
       if ( ((st0_ptr->exp <= EXP_UNDER) ||
 	    (st1_ptr->exp <= EXP_UNDER)) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       poly_atan(st0_ptr, st1_ptr, st1_ptr);
 
@@ -1246,7 +1246,7 @@
 		  if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 		    return;
 		}
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	      if ( st0_ptr->sign == SIGN_POS )
 		{
@@ -1268,7 +1268,7 @@
 	      if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 		return;
 	    }
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  reg_move(&CONST_PI2, st1_ptr);
 	}
@@ -1285,7 +1285,7 @@
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
 	}
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       if ( st0_ptr->sign == SIGN_POS )
 	{ /* An 80486 preserves the sign */ pop(); return; }
@@ -1301,7 +1301,7 @@
 #ifdef DENORM_OPERAND
       if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       reg_move(&CONST_PI2, st1_ptr);
       st1_ptr->sign = sign;
@@ -1309,7 +1309,7 @@
 #ifdef PARANOID
   else
     EXCEPTION(EX_INTERNAL | 0x125);
-#endif PARANOID
+#endif /* PARANOID */
 
   pop();
   set_precision_flag_up();  /* We do not really know if up or down */
@@ -1341,7 +1341,7 @@
       if ( ((st0_ptr->exp <= EXP_UNDER) ||
 	    (st1_ptr->exp <= EXP_UNDER)) && denormal_operand() )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       if ( poly_l2p1(st0_ptr, st1_ptr, st1_ptr) )
 	{
@@ -1350,7 +1350,7 @@
 #else
 	  if ( arith_invalid(st1_ptr) )  /* poly_l2p1() returned invalid */
 	    return;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	}
       if ( st1_ptr->exp <= EXP_UNDER )
 	{
@@ -1379,8 +1379,8 @@
 	  if ( (st1_tag == TW_Valid) && (st1_ptr->exp <= EXP_UNDER) &&
 	      (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
-	  
+#endif /* DENORM_OPERAND */
+
 	  st0_ptr->sign ^= st1_ptr->sign;
 	  reg_move(st0_ptr, st1_ptr);
 	}
@@ -1403,7 +1403,7 @@
 	  EXCEPTION(EX_INTERNAL | 0x116);
 	  return;
 	}
-#endif PARANOID
+#endif /* PARANOID */
       pop(); return;
     }
   else if ( st0_tag == TW_Valid )
@@ -1419,20 +1419,20 @@
 		  st1_ptr->sign ^= SIGN_POS^SIGN_NEG;
 #else
 		  if ( arith_invalid(st1_ptr) ) return;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 		  pop(); return;
 		}
 #ifdef DENORM_OPERAND
 	      if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 		return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      st1_ptr->sign ^= SIGN_POS^SIGN_NEG;
 	      pop(); return;
 	    }
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  pop(); return;
 	}
       if ( st1_tag == TW_Infinity )
@@ -1448,20 +1448,20 @@
 		  st1_ptr->sign ^= SIGN_POS^SIGN_NEG;
 #else
 		  if ( arith_invalid(st1_ptr) ) return;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 		  pop(); return;
 		}
 #ifdef DENORM_OPERAND
 	      if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 		return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      st1_ptr->sign ^= SIGN_POS^SIGN_NEG;
 	      pop(); return;
 	    }
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  pop(); return;
 	}
       if ( st1_tag == TW_NaN )
@@ -1492,19 +1492,19 @@
 	  /* This should have higher priority than denormals, but... */
 	  if ( arith_invalid(st1_ptr) )  /* log(-infinity) */
 	    return;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 #ifdef DENORM_OPERAND
 	  if ( st1_tag != TW_Zero )
 	    {
 	      if ( (exponent <= EXP_UNDER) && (denormal_operand()) )
 		return;
 	    }
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 #ifdef PECULIAR_486
 	  /* Denormal operands actually get higher priority */
 	  if ( arith_invalid(st1_ptr) )  /* log(-infinity) */
 	    return;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 	  pop();
 	  return;
 	}
@@ -1515,13 +1515,13 @@
 	    pop();
 	  return;
 	}
-	
+
       /* st(1) must be valid here. */
 
 #ifdef DENORM_OPERAND
       if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       /* The Manual says that log(Infinity) is invalid, but a real
 	 80486 sensibly says that it is o.k. */
@@ -1537,7 +1537,7 @@
     {
       EXCEPTION(EX_INTERNAL | 0x117);
     }
-#endif PARANOID
+#endif /* PARANOID */
 }
 
 
@@ -1559,7 +1559,7 @@
       if ( ((st0_ptr->exp <= EXP_UNDER) ||
 	    (st1_ptr->exp <= EXP_UNDER)) && (denormal_operand()) )
 	return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
       if ( st1_ptr->exp > EXP_BIAS + 30 )
 	{
@@ -1605,7 +1605,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  return;
 	}
@@ -1614,7 +1614,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st0_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  if ( st1_ptr->sign == SIGN_POS )
 	    { reg_move(&CONST_INF, st0_ptr); }
@@ -1634,7 +1634,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  return;
 	}
@@ -1660,7 +1660,7 @@
 #ifdef DENORM_OPERAND
 	  if ( (st1_ptr->exp <= EXP_UNDER) && (denormal_operand()) )
 	    return;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	  return;
 	}
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/get_address.c linux-2.0.40/arch/i386/math-emu/get_address.c
--- linux-2.0.39/arch/i386/math-emu/get_address.c	Fri Aug 19 07:54:01 1994
+++ linux-2.0.40/arch/i386/math-emu/get_address.c	Thu Aug 23 19:04:45 2001
@@ -135,7 +135,7 @@
       EXCEPTION(EX_INTERNAL|0x130);
       math_abort(FPU_info,SIGSEGV);
     }
-#endif PARANOID
+#endif /* PARANOID */
   *selector = VM86_REG_(segment);
   return (unsigned long)VM86_REG_(segment) << 4;
 }
@@ -155,7 +155,7 @@
       EXCEPTION(EX_INTERNAL|0x132);
       math_abort(FPU_info,SIGSEGV);
     }
-#endif PARANOID
+#endif /* PARANOID */
 
   *selector = PM_REG_(segment);
 
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/load_store.c linux-2.0.40/arch/i386/math-emu/load_store.c
--- linux-2.0.39/arch/i386/math-emu/load_store.c	Thu Jun  2 09:28:26 1994
+++ linux-2.0.40/arch/i386/math-emu/load_store.c	Thu Aug 23 19:05:01 2001
@@ -83,7 +83,7 @@
 #ifdef PARANOID
       else
 	EXCEPTION(EX_INTERNAL|0x140);
-#endif PARANOID
+#endif /* PARANOID */
     }
 
   switch ( type_table[type] )
@@ -109,7 +109,7 @@
     default:
       EXCEPTION(EX_INTERNAL|0x141);
       return 0;
-#endif PARANOID
+#endif /* PARANOID */
     }
 
   switch ( type )
@@ -209,7 +209,7 @@
 	partial_status &= ~(SW_Summary | SW_Backward);
 #ifdef PECULIAR_486
       control_word |= 0x40;  /* An 80486 appears to always set this bit */
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
       return 1;
     case 025:      /* fld m80real */
       clear_C1();
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/poly.h linux-2.0.40/arch/i386/math-emu/poly.h
--- linux-2.0.39/arch/i386/math-emu/poly.h	Mon Aug  1 07:19:14 1994
+++ linux-2.0.40/arch/i386/math-emu/poly.h	Thu Aug 23 19:07:12 2001
@@ -113,4 +113,4 @@
                :"=g" (*x):"g" (x):"si","ax","cx");
 }
 
-#endif _POLY_H
+#endif /* _POLY_H */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/poly_2xm1.c linux-2.0.40/arch/i386/math-emu/poly_2xm1.c
--- linux-2.0.39/arch/i386/math-emu/poly_2xm1.c	Mon Aug  1 07:19:14 1994
+++ linux-2.0.40/arch/i386/math-emu/poly_2xm1.c	Thu Aug 23 19:05:10 2001
@@ -67,7 +67,7 @@
       EXCEPTION(EX_INTERNAL|0x127);
       return 1;
     }
-#endif PARANOID
+#endif /* PARANOID */
 
   argSignif.lsw = 0;
   XSIG_LL(argSignif) = Xll = significand(arg);
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/poly_atan.c linux-2.0.40/arch/i386/math-emu/poly_atan.c
--- linux-2.0.39/arch/i386/math-emu/poly_atan.c	Mon Aug  1 07:19:14 1994
+++ linux-2.0.40/arch/i386/math-emu/poly_atan.c	Thu Aug 23 19:05:47 2001
@@ -97,7 +97,7 @@
 	      EXCEPTION(EX_INTERNAL|0x104);  /* There must be a logic error */
 	      return;
 	    }
-#endif PARANOID
+#endif /* PARANOID */
 	  argSignif.msw = 0;   /* Make the transformed arg -> 0.0 */
 	}
       else
@@ -108,10 +108,10 @@
 	  if ( exponent < -1 )
 	    shr_Xsig(&Numer, -1-exponent);
 	  negate_Xsig(&Numer);
-      
+
 	  shr_Xsig(&Denom, -exponent);
 	  Denom.msw |= 0x80000000;
-      
+
 	  div_Xsig(&Numer, &Denom, &argSignif);
 
 	  exponent = -1 + norm_Xsig(&argSignif);
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/poly_l2.c linux-2.0.40/arch/i386/math-emu/poly_l2.c
--- linux-2.0.39/arch/i386/math-emu/poly_l2.c	Mon Aug  1 07:19:14 1994
+++ linux-2.0.40/arch/i386/math-emu/poly_l2.c	Thu Aug 23 19:05:55 2001
@@ -226,7 +226,7 @@
 	  /* The argument is too large */
 	}
     }
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
   arg_signif.lsw = argSignif.lsw; XSIG_LL(arg_signif) = XSIG_LL(argSignif);
   adj = norm_Xsig(&argSignif);
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/poly_sin.c linux-2.0.40/arch/i386/math-emu/poly_sin.c
--- linux-2.0.39/arch/i386/math-emu/poly_sin.c	Mon Aug  1 07:19:15 1994
+++ linux-2.0.40/arch/i386/math-emu/poly_sin.c	Thu Aug 23 19:06:13 2001
@@ -77,7 +77,7 @@
       reg_move(&CONST_Z, result);
       return;
     }
-#endif PARANOID
+#endif /* PARANOID */
 
   exponent = arg->exp - EXP_BIAS;
 
@@ -205,7 +205,7 @@
     {
       EXCEPTION(EX_INTERNAL|0x150);
     }
-#endif PARANOID
+#endif /* PARANOID */
 
 }
 
@@ -238,7 +238,7 @@
       reg_move(&CONST_QNaN, result);
       return;
     }
-#endif PARANOID
+#endif /* PARANOID */
 
   exponent = arg->exp - EXP_BIAS;
 
@@ -403,6 +403,6 @@
     {
       EXCEPTION(EX_INTERNAL|0x151);
     }
-#endif PARANOID
+#endif /* PARANOID */
 
 }
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/poly_tan.c linux-2.0.40/arch/i386/math-emu/poly_tan.c
--- linux-2.0.39/arch/i386/math-emu/poly_tan.c	Fri Aug 19 07:54:01 1994
+++ linux-2.0.40/arch/i386/math-emu/poly_tan.c	Thu Aug 23 19:06:20 2001
@@ -65,7 +65,7 @@
 #ifdef PARANOID
   if ( arg->sign != 0 )	/* Can't hack a number < 0.0 */
     { arith_invalid(result); return; }  /* Need a positive number */
-#endif PARANOID
+#endif /* PARANOID */
 
   /* Split the problem into two domains, smaller and larger than pi/4 */
   if ( (exponent == 0) || ((exponent == -1) && (arg->sigh > 0xc90fdaa2)) )
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_add_sub.c linux-2.0.40/arch/i386/math-emu/reg_add_sub.c
--- linux-2.0.39/arch/i386/math-emu/reg_add_sub.c	Wed Dec  1 13:44:16 1993
+++ linux-2.0.40/arch/i386/math-emu/reg_add_sub.c	Thu Aug 23 19:07:03 2001
@@ -70,7 +70,7 @@
 	  if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 	      denormal_operand() )
 	    return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  reg_move(&CONST_Z, dest);
 	  /* sign depends upon rounding mode */
 	  dest->sign = ((control_w & CW_RC) != RC_DOWN)
@@ -112,7 +112,7 @@
 	      if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(b, dest);
 	    }
 	  return 0;
@@ -123,7 +123,7 @@
 	  if ( (a->tag == TW_Valid) && (a->exp <= EXP_UNDER) &&
 	      denormal_operand() )
 	    return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  reg_move(a, dest); return 0;
 	}
       else if (a->tag == TW_Infinity)
@@ -134,7 +134,7 @@
 	      if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(a, dest); return 0;
 	    }
 	  if (a->sign == b->sign)
@@ -150,7 +150,7 @@
 	  if ( (a->tag == TW_Valid) && (a->exp <= EXP_UNDER) &&
 	      denormal_operand() )
 	    return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  reg_move(b, dest); return 0;
 	}
     }
@@ -203,7 +203,7 @@
 	      if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(&CONST_Z, dest);
 	      /* sign depends upon rounding mode */
 	      dest->sign = ((control_w & CW_RC) != RC_DOWN)
@@ -262,7 +262,7 @@
 	      if ( (a->tag == TW_Valid) && (a->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(a, dest);
 	    }
 	  return 0;
@@ -273,7 +273,7 @@
 	  if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 	      denormal_operand() )
 	    return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  reg_move(b, dest);
 	  dest->sign ^= SIGN_POS^SIGN_NEG;
 	  return 0;
@@ -286,7 +286,7 @@
 	      if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(a, dest); return 0;
 	    }
 	  /* Both args are Infinity */
@@ -304,7 +304,7 @@
 	  if ( (a->tag == TW_Valid) && (a->exp <= EXP_UNDER) &&
 	      denormal_operand() )
 	    return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	  reg_move(b, dest);
 	  dest->sign ^= SIGN_POS^SIGN_NEG;
 	  return 0;
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_compare.c linux-2.0.40/arch/i386/math-emu/reg_compare.c
--- linux-2.0.39/arch/i386/math-emu/reg_compare.c	Thu Jun  2 09:28:27 1994
+++ linux-2.0.40/arch/i386/math-emu/reg_compare.c	Thu Aug 23 19:08:13 2001
@@ -41,7 +41,7 @@
 #ifdef DENORM_OPERAND
 		| ((b->exp <= EXP_UNDER) ?
 		   COMP_Denormal : 0)
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 		  ;
 	    }
 	}
@@ -54,7 +54,7 @@
 #ifdef DENORM_OPERAND
 		| ((st0_ptr->exp <= EXP_UNDER )
 		   ? COMP_Denormal : 0 )
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 		  ;
 	    }
 	}
@@ -68,7 +68,7 @@
 #ifdef DENORM_OPERAND
 	      | (((b->tag == TW_Valid) && (b->exp <= EXP_UNDER)) ?
 		COMP_Denormal : 0 )
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 ;
 	    }
 	  else if ( b->tag == TW_Infinity )
@@ -88,7 +88,7 @@
 		| (((st0_tag == TW_Valid)
 		    && (st0_ptr->exp <= EXP_UNDER)) ?
 		   COMP_Denormal : 0)
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 		  ;
 	    }
 	  /* Fall through to the NaN code */
@@ -106,16 +106,16 @@
 	    /* Neither is a signaling NaN */
 	    return COMP_No_Comp | COMP_NaN;
 	}
-      
+
       EXCEPTION(EX_Invalid);
     }
-  
+
 #ifdef PARANOID
   if (!(st0_ptr->sigh & 0x80000000)) EXCEPTION(EX_Invalid);
   if (!(b->sigh & 0x80000000)) EXCEPTION(EX_Invalid);
-#endif PARANOID
+#endif /* PARANOID */
+
 
-  
   if (st0_ptr->sign != b->sign)
     {
       return ((st0_ptr->sign == SIGN_POS) ? COMP_A_gt_B : COMP_A_lt_B)
@@ -123,7 +123,7 @@
 	|
 	  ( ((st0_ptr->exp <= EXP_UNDER) || (b->exp <= EXP_UNDER)) ?
 	   COMP_Denormal : 0)
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	    ;
     }
 
@@ -147,7 +147,7 @@
 	|
 	  ( ((st0_ptr->exp <= EXP_UNDER) || (b->exp <= EXP_UNDER)) ?
 	   COMP_Denormal : 0)
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	    ;
     }
   if ( diff < 0 )
@@ -157,7 +157,7 @@
 	|
 	  ( ((st0_ptr->exp <= EXP_UNDER) || (b->exp <= EXP_UNDER)) ?
 	   COMP_Denormal : 0)
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	    ;
     }
 
@@ -166,7 +166,7 @@
     |
       ( ((st0_ptr->exp <= EXP_UNDER) || (b->exp <= EXP_UNDER)) ?
        COMP_Denormal : 0)
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	;
 
 }
@@ -204,7 +204,7 @@
 	EXCEPTION(EX_INTERNAL|0x121);
 	f = SW_C3 | SW_C2 | SW_C0;
 	break;
-#endif PARANOID
+#endif /* PARANOID */
       }
   setcc(f);
   if (c & COMP_Denormal)
@@ -254,7 +254,7 @@
 	EXCEPTION(EX_INTERNAL|0x122);
 	f = SW_C3 | SW_C2 | SW_C0;
 	break;
-#endif PARANOID
+#endif /* PARANOID */
       }
   setcc(f);
   if (c & COMP_Denormal)
@@ -309,7 +309,7 @@
 	EXCEPTION(EX_INTERNAL|0x123);
 	f = SW_C3 | SW_C2 | SW_C0;
 	break;
-#endif PARANOID
+#endif /* PARANOID */
       }
   setcc(f);
   if (c & COMP_Denormal)
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_constant.h linux-2.0.40/arch/i386/math-emu/reg_constant.h
--- linux-2.0.39/arch/i386/math-emu/reg_constant.h	Sat Mar 29 01:12:25 1997
+++ linux-2.0.40/arch/i386/math-emu/reg_constant.h	Thu Aug 23 19:09:34 2001
@@ -28,4 +28,4 @@
 extern FPU_REG const CONST_MINF;
 extern FPU_REG const CONST_QNaN;
 
-#endif _REG_CONSTANT_H_
+#endif /* _REG_CONSTANT_H_ */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_div.S linux-2.0.40/arch/i386/math-emu/reg_div.S
--- linux-2.0.39/arch/i386/math-emu/reg_div.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/reg_div.S	Mon Sep 10 15:30:27 2001
@@ -24,7 +24,7 @@
 	movl	%esp,%ebp
 #ifndef NON_REENTRANT_FPU
 	subl	$28,%esp	/* Needed by divide_kernel */
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 	pushl	%esi
 	pushl	%edi
@@ -57,7 +57,7 @@
 	jnz	fpu_Arith_exit
 
 xL_arg2_not_denormal:
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 /* Both arguments are TW_Valid */
 	movb	TW_Valid,TAG(%edi)
@@ -113,7 +113,7 @@
 	/* arg2 must be zero or valid */
 	cmpb	TW_Zero,TAG(%ebx)
 	ja	L_unknown_tags
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* Note that p16-9 says that infinity/0 returns infinity */
 	jmp	L_copy_arg1		/* Answer is Inf */
@@ -126,7 +126,7 @@
 	call	SYMBOL_NAME(denormal_operand)
 	orl	%eax,%eax
 	jnz	fpu_Arith_exit
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	jmp	L_copy_arg1		/* Answer is Inf */
 
@@ -141,7 +141,7 @@
 	/* arg1 must be valid */
 	cmpb	TW_Valid,TAG(%esi)
 	ja	L_unknown_tags
-#endif PARANOID
+#endif /* PARANOID */
 
 /* Division by zero error */
 	pushl	%edi			/* destination */
@@ -165,7 +165,7 @@
 	call	SYMBOL_NAME(denormal_operand)
 	orl	%eax,%eax
 	jnz	fpu_Arith_exit
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	jmp	L_return_zero		/* Answer is zero */
 
@@ -174,7 +174,7 @@
 #ifdef PARANOID
 	cmpb	TW_Zero,TAG(%esi)
 	jne	L_unknown_tags
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* arg1 is zero, arg2 is not Infinity or a NaN */
 
@@ -185,7 +185,7 @@
 	call	SYMBOL_NAME(denormal_operand)
 	orl	%eax,%eax
 	jnz	fpu_Arith_exit
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 L_copy_arg1:
 	movb	TAG(%esi),%ax
@@ -215,7 +215,7 @@
 	leal	-40(%ebp),%esp
 #else
 	leal	-12(%ebp),%esp
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 	popl	%ebx
 	popl	%edi
@@ -245,4 +245,4 @@
 	movl	SYMBOL_NAME(CONST_QNaN)+8,%eax
 	movl	%eax,SIGH(%edi)
 	jmp	LDiv_exit		/* %eax is nz */
-#endif PARANOID
+#endif /* PARANOID */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_ld_str.c linux-2.0.40/arch/i386/math-emu/reg_ld_str.c
--- linux-2.0.39/arch/i386/math-emu/reg_ld_str.c	Mon May  6 15:31:17 1996
+++ linux-2.0.40/arch/i386/math-emu/reg_ld_str.c	Thu Aug 23 19:08:52 2001
@@ -485,7 +485,7 @@
 	      if ( control_word & CW_Underflow )
 		denormal_operand();
 	    }
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
 	  tmp.exp += -DOUBLE_Emin + 52;  /* largest exp to be 51 */
 
@@ -498,7 +498,7 @@
 		 converts to decide underflow. */
 	      if ( !((tmp.sigh == 0x00100000) && (tmp.sigl == 0) &&
 		  (st0_ptr->sigl & 0x000007ff)) )
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 		{
 		  EXCEPTION(EX_Underflow);
 		  /* This is a special case: see sec 16.2.5.1 of
@@ -685,7 +685,7 @@
 	      if ( control_word & CW_Underflow )
 		denormal_operand();
 	    }
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
 	  tmp.exp += -SINGLE_Emin + 23;  /* largest exp to be 22 */
 
@@ -698,7 +698,7 @@
 		 converts to decide underflow. */
 	      if ( !((tmp.sigl == 0x00800000) &&
 		  ((st0_ptr->sigh & 0x000000ff) || st0_ptr->sigl)) )
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 		{
 		  EXCEPTION(EX_Underflow);
 		  /* This is a special case: see sec 16.2.5.1 of
@@ -1206,7 +1206,7 @@
 
 #ifdef PECULIAR_486
   control_word &= ~0xe080;
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
   top = (partial_status >> SW_Top_Shift) & 7;
 
@@ -1313,7 +1313,7 @@
       put_fs_long(control_word & ~0xe080, (unsigned short *) d);
 #else
       put_fs_word(control_word, (unsigned short *) d);
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
       put_fs_word(status_word(), (unsigned short *) (d+2));
       put_fs_word(tag_word(), (unsigned short *) (d+4));
       put_fs_word(instruction_address.offset, (unsigned short *) (d+6));
@@ -1346,7 +1346,7 @@
       put_fs_word(control_word, (unsigned short *) d);
       put_fs_word(status_word(), (unsigned short *) (d+4));
       put_fs_word(tag_word(), (unsigned short *) (d+8));
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
       put_fs_long(instruction_address.offset, (unsigned long *) (d+0x0c));
       put_fs_word(instruction_address.selector, (unsigned short *) (d+0x10));
       put_fs_word(instruction_address.opcode, (unsigned short *) (d+0x12));
@@ -1357,7 +1357,7 @@
       put_fs_word(0xffff, (unsigned short *) (d+0x1a));
 #else
       put_fs_long(operand_address.selector, (unsigned long *) (d+0x18));
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
       RE_ENTRANT_CHECK_ON;
       d += 0x1c;
     }
@@ -1414,7 +1414,7 @@
       if (e > 0x7fff || e < -63)
 	EXCEPTION(EX_INTERNAL | 0x162);
     }
-#endif PARANOID
+#endif /* PARANOID */
 
   /*
     All numbers except denormals are stored internally in a
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_mul.c linux-2.0.40/arch/i386/math-emu/reg_mul.c
--- linux-2.0.39/arch/i386/math-emu/reg_mul.c	Fri Feb 25 13:42:46 1994
+++ linux-2.0.40/arch/i386/math-emu/reg_mul.c	Thu Aug 23 19:09:08 2001
@@ -46,7 +46,7 @@
 	{
 	  if ( denormal_operand() ) return 1;
 	}
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
       /* Must have either both arguments == zero, or
 	 one valid and the other zero.
 	 The result is therefore zero. */
@@ -72,7 +72,7 @@
 	      if ( (b->tag == TW_Valid) && (b->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(a, dest);
 	      dest->sign = sign;
 	    }
@@ -88,7 +88,7 @@
 	      if ( (a->tag == TW_Valid) && (a->exp <= EXP_UNDER) &&
 		  denormal_operand() )
 		return 1;
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 	      reg_move(b, dest);
 	      dest->sign = sign;
 	    }
@@ -100,6 +100,6 @@
 	  EXCEPTION(EX_INTERNAL|0x102);
 	  return 1;
 	}
-#endif PARANOID
+#endif /* PARANOID */
     }
 }
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_norm.S linux-2.0.40/arch/i386/math-emu/reg_norm.S
--- linux-2.0.39/arch/i386/math-emu/reg_norm.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/reg_norm.S	Mon Sep 10 15:31:15 2001
@@ -34,7 +34,7 @@
 	addl	$4,%esp
 
 L_ok:
-#endif PARANOID
+#endif /* PARANOID */
 
 	movl	SIGH(%ebx),%edx
 	movl	SIGL(%ebx),%eax
@@ -111,7 +111,7 @@
 	addl	$4,%esp
 
 L_ok_nuo:
-#endif PARANOID
+#endif /* PARANOID */
 
 	movl	SIGH(%ebx),%edx
 	movl	SIGL(%ebx),%eax
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_round.S linux-2.0.40/arch/i386/math-emu/reg_round.S
--- linux-2.0.39/arch/i386/math-emu/reg_round.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/reg_round.S	Mon Sep 10 15:34:53 2001
@@ -97,7 +97,7 @@
 	.byte	0
 FPU_denormal:
 	.byte	0
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 
 .text
@@ -127,13 +127,13 @@
 
 #ifndef NON_REENTRANT_FPU
 	pushl	%ebx		/* adjust the stack pointer */
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 #ifdef PARANOID
 /* Cannot use this here yet */
 /*	orl	%eax,%eax */
 /*	jns	L_entry_bugged */
-#endif PARANOID
+#endif /* PARANOID */
 
 	cmpl	EXP_UNDER,EXP(%edi)
 	jle	xMake_denorm			/* The number is a de-normal */
@@ -161,12 +161,12 @@
 	je	LRound_To_64
 #ifdef PARANOID
 	jmp	L_bugged_denorm_486
-#endif PARANOID
+#endif /* PARANOID */
 #else
 #ifdef PARANOID
 	jmp	L_bugged_denorm	/* There is no bug, just a bad control word */
-#endif PARANOID
-#endif PECULIAR_486
+#endif /* PARANOID */
+#endif /* PECULIAR_486 */
 
 
 /* Round etc to 24 bit precision */
@@ -187,7 +187,7 @@
 
 #ifdef PARANOID
 	jmp	L_bugged_round24
-#endif PARANOID
+#endif /* PARANOID */
 
 LUp_24:
 	cmpb	SIGN_POS,SIGN(%edi)
@@ -267,7 +267,7 @@
 
 #ifdef PARANOID
 	jmp	L_bugged_round53
-#endif PARANOID
+#endif /* PARANOID */
 
 LUp_53:
 	cmpb	SIGN_POS,SIGN(%edi)
@@ -341,7 +341,7 @@
 
 #ifdef PARANOID
 	jmp	L_bugged_round64
-#endif PARANOID
+#endif /* PARANOID */
 
 LUp_64:
 	cmpb	SIGN_POS,SIGN(%edi)
@@ -417,7 +417,7 @@
 fpu_reg_round_exit:
 #ifndef NON_REENTRANT_FPU
 	popl	%ebx		/* adjust the stack pointer */
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 fpu_Arith_exit:
 	popl	%ebx
@@ -553,7 +553,7 @@
 	/* But check it... just in case. */
 	cmpl	EXP_UNDER+1,EXP(%edi)
 	jne	L_norm_bugged
-#endif PARANOID
+#endif /* PARANOID */
 
 #ifdef PECULIAR_486
 	/*
@@ -566,7 +566,7 @@
 	 */
 	orl	%eax,%eax		/* ms bits */
 	js	LNormalise_shift_done	/* Will be masked underflow */
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
 	orl	%eax,%eax		/* ms bits */
 	js	xL_Normalised		/* No longer a denormal */
@@ -663,7 +663,7 @@
 	call	EXCEPTION
 	popl	%ebx
 	jmp	L_exception_exit
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
 L_bugged_round24:
 	pushl	EX_INTERNAL|0x231
@@ -696,4 +696,4 @@
 L_exception_exit:
 	mov	$1,%eax
 	jmp	fpu_reg_round_exit
-#endif PARANOID
+#endif /* PARANOID */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_u_add.S linux-2.0.40/arch/i386/math-emu/reg_u_add.S
--- linux-2.0.39/arch/i386/math-emu/reg_u_add.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/reg_u_add.S	Mon Sep 10 15:31:31 2001
@@ -56,7 +56,7 @@
 	jnz	fpu_Arith_exit
 
 xOp2_not_denorm:
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	movl	EXP(%esi),%ecx
 	subl	EXP(%edi),%ecx		/* exp1 - exp2 */
@@ -92,7 +92,7 @@
 
 	testl	$0x80000000,SIGH(%esi)
 	je	L_bugged
-#endif PARANOID
+#endif /* PARANOID */
 
 /* The number to be shifted is in %eax:%ebx:%edx */
 	cmpw	$32,%cx		/* shrd only works for 0..31 bits */
@@ -176,7 +176,7 @@
 	call	EXCEPTION
 	pop	%ebx
 	jmp	L_exit
-#endif PARANOID
+#endif /* PARANOID */
 
 
 L_exit:
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_u_div.S linux-2.0.40/arch/i386/math-emu/reg_u_div.S
--- linux-2.0.39/arch/i386/math-emu/reg_u_div.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/reg_u_div.S	Wed Sep 12 15:14:04 2001
@@ -65,7 +65,7 @@
 	.long	0
 FPU_ovfl_flag:
 	.byte	0
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 
 .text
@@ -74,7 +74,7 @@
 	movl	%esp,%ebp
 #ifndef NON_REENTRANT_FPU
 	subl	$28,%esp
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 	pushl	%esi
 	pushl	%edi
@@ -103,7 +103,7 @@
 	jnz	fpu_Arith_exit
 
 xOp2_not_denorm:
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 ENTRY(divide_kernel)
 #ifdef PARANOID
@@ -111,7 +111,7 @@
 /*	je	L_bugged */
 	testl	$0x80000000, SIGH(%ebx)	/* Divisor */
 	je	L_bugged
-#endif PARANOID
+#endif /* PARANOID */
 
 /* Check if the divisor can be treated as having just 32 bits */
 	cmpl	$0,SIGL(%ebx)
@@ -247,7 +247,7 @@
 
 #ifdef PARANOID
 	jb	L_bugged_1
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* need to subtract another once of the denom */
 	incl	FPU_result_2	/* Correct the answer */
@@ -260,7 +260,7 @@
 #ifdef PARANOID
 	sbbl	$0,FPU_accum_3
 	jne	L_bugged_1	/* Must check for non-zero result here */
-#endif PARANOID
+#endif /* PARANOID */
 
 /*----------------------------------------------------------------------*/
 /* Half of the main problem is done, there is just a reduced numerator
@@ -290,7 +290,7 @@
 
 #ifdef PARANOID
 	je	L_bugged_2	/* Can't bump the result to 1.0 */
-#endif PARANOID
+#endif /* PARANOID */
 
 LDo_2nd_div:
 	cmpl	$0,%ecx		/* augmented denom msw */
@@ -313,7 +313,7 @@
 
 #ifdef PARANOID
 	jc	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	movl	FPU_result_1,%eax	/* Get the result back */
 	mull	SIGL(%ebx)	/* now mul the ls dw of the denom */
@@ -324,14 +324,14 @@
 
 #ifdef PARANOID
 	jc	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	jz	LDo_3rd_32_bits
 
 #ifdef PARANOID
 	cmpl	$1,FPU_accum_2
 	jne	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* need to subtract another once of the denom */
 	movl	SIGL(%ebx),%eax
@@ -343,14 +343,14 @@
 #ifdef PARANOID
 	jc	L_bugged_2
 	jne	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 	addl	$1,FPU_result_1	/* Correct the answer */
 	adcl	$0,FPU_result_2
 
 #ifdef PARANOID
 	jc	L_bugged_2	/* Must check for non-zero result here */
-#endif PARANOID
+#endif /* PARANOID */
 
 /*----------------------------------------------------------------------*/
 /* The division is essentially finished here, we just need to perform
@@ -468,4 +468,4 @@
 
 	leave
 	ret
-#endif PARANOID
+#endif /* PARANOID */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_u_mul.S linux-2.0.40/arch/i386/math-emu/reg_u_mul.S
--- linux-2.0.39/arch/i386/math-emu/reg_u_mul.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/reg_u_mul.S	Mon Sep 10 15:33:02 2001
@@ -40,7 +40,7 @@
 	.long	0
 FPU_accum_1:
 	.long	0
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 
 .text
@@ -49,7 +49,7 @@
 	movl	%esp,%ebp
 #ifndef NON_REENTRANT_FPU
 	subl	$8,%esp
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 	pushl	%esi
 	pushl	%edi
@@ -63,7 +63,7 @@
 	jz	L_bugged
 	testl	$0x80000000,SIGH(%edi)
 	jz	L_bugged
-#endif PARANOID
+#endif /* PARANOID */
 
 #ifdef DENORM_OPERAND
 	movl	EXP(%esi),%eax
@@ -84,7 +84,7 @@
 	jnz	fpu_Arith_exit
 
 xOp2_not_denorm:
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	xorl	%ecx,%ecx
 	xorl	%ebx,%ebx
@@ -156,5 +156,5 @@
 	popl	%esi
 	leave
 	ret
-#endif PARANOID
+#endif /* PARANOID */
 
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/reg_u_sub.S linux-2.0.40/arch/i386/math-emu/reg_u_sub.S
--- linux-2.0.39/arch/i386/math-emu/reg_u_sub.S	Sun Nov 15 19:32:47 1998
+++ linux-2.0.40/arch/i386/math-emu/reg_u_sub.S	Mon Sep 10 15:33:24 2001
@@ -57,7 +57,7 @@
 	jnz	fpu_Arith_exit
 
 xOp2_not_denorm:
-#endif DENORM_OPERAND
+#endif /* DENORM_OPERAND */
 
 	movl	EXP(%esi),%ecx
 	subl	EXP(%edi),%ecx	/* exp1 - exp2 */
@@ -71,7 +71,7 @@
 
 	testl	$0x80000000,SIGH(%esi)
 	je	L_bugged_2
-#endif PARANOID
+#endif /* PARANOID */
 
 /*--------------------------------------+
  |	Form a register holding the     |
@@ -184,7 +184,7 @@
 #ifdef PARANOID
 	/* We can never get a borrow */
 	jc	L_bugged
-#endif PARANOID
+#endif /* PARANOID */
 
 /*--------------------------------------+
  |	Normalize the result		|
@@ -218,7 +218,7 @@
 #ifdef PARANOID
 	orl	%edx,%edx
 	jnz	L_bugged_3
-#endif PARANOID
+#endif /* PARANOID */
 
 	/* The result is zero */
 	movb	TW_Zero,TAG(%edi)
@@ -277,7 +277,7 @@
 	call	EXCEPTION
 	pop	%ebx
 	jmp	L_error_exit
-#endif PARANOID
+#endif /* PARANOID */
 
 
 L_error_exit:
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/status_w.h linux-2.0.40/arch/i386/math-emu/status_w.h
--- linux-2.0.39/arch/i386/math-emu/status_w.h	Sat Mar 29 01:12:25 1997
+++ linux-2.0.40/arch/i386/math-emu/status_w.h	Thu Aug 23 19:09:26 2001
@@ -58,8 +58,8 @@
 #  define clear_C1()  { partial_status &= ~SW_C1; }
 # else
 #  define clear_C1()
-#endif PECULIAR_486
+#endif /* PECULIAR_486 */
 
-#endif __ASSEMBLY__
+#endif /* __ASSEMBLY__ */
 
-#endif _STATUS_H_
+#endif /* _STATUS_H_ */
diff -u --recursive --new-file linux-2.0.39/arch/i386/math-emu/wm_sqrt.S linux-2.0.40/arch/i386/math-emu/wm_sqrt.S
--- linux-2.0.39/arch/i386/math-emu/wm_sqrt.S	Thu Oct  5 14:30:43 1995
+++ linux-2.0.40/arch/i386/math-emu/wm_sqrt.S	Mon Sep 10 15:33:52 2001
@@ -70,7 +70,7 @@
 	.long	0
 FPU_fsqrt_arg_0:
 	.long	0		/* ls word, at most the ms bit is set */
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 
 
 .text
@@ -79,7 +79,7 @@
 	movl	%esp,%ebp
 #ifndef NON_REENTRANT_FPU
 	subl	$28,%esp
-#endif NON_REENTRANT_FPU
+#endif /* NON_REENTRANT_FPU */
 	pushl	%esi
 	pushl	%edi
 	pushl	%ebx
@@ -210,7 +210,7 @@
 /* It should be possible to get here only if the arg is ffff....ffff */
 	cmp	$0xffffffff,FPU_fsqrt_arg_1
 	jnz	sqrt_stage_2_error
-#endif PARANOID
+#endif /* PARANOID */
 
 /* The best rounded result. */
 	xorl	%eax,%eax
@@ -224,7 +224,7 @@
 sqrt_stage_2_error:
 	pushl	EX_INTERNAL|0x213
 	call	EXCEPTION
-#endif PARANOID
+#endif /* PARANOID */
 
 sqrt_stage_2_done:
 
@@ -279,7 +279,7 @@
 	call	EXCEPTION
 
 sqrt_stage_3_no_error:
-#endif PARANOID
+#endif /* PARANOID */
 
 	movl	FPU_accum_2,%edx
 	movl	FPU_accum_1,%eax
@@ -386,7 +386,7 @@
 	call	EXCEPTION
 
 sqrt_near_exact_ok:
-#endif PARANOID
+#endif /* PARANOID */
 
 	or	%ebx,%ebx
 	js	sqrt_near_exact_small
@@ -446,7 +446,7 @@
 	call	EXCEPTION
 
 sqrt_more_prec_ok:
-#endif PARANOID
+#endif /* PARANOID */
 
 	or	%ebx,%ebx
 	js	sqrt_more_prec_small
diff -u --recursive --new-file linux-2.0.39/arch/i386/mm/fault.c linux-2.0.40/arch/i386/mm/fault.c
--- linux-2.0.39/arch/i386/mm/fault.c	Tue Dec  2 22:58:53 1997
+++ linux-2.0.40/arch/i386/mm/fault.c	Mon Sep 10 17:54:45 2001
@@ -49,7 +49,7 @@
 	int write;
 
 	/* get the address */
-	__asm__("movl %%cr2,%0":"=r" (address));
+	__asm__("movl %%cr2,%0" : "=r" (address));
 	down(&mm->mmap_sem);
 	vma = find_vma(mm, address);
 	if (!vma)
diff -u --recursive --new-file linux-2.0.39/arch/i386/mm/init.c linux-2.0.40/arch/i386/mm/init.c
--- linux-2.0.39/arch/i386/mm/init.c	Sun Jun 13 19:21:00 1999
+++ linux-2.0.40/arch/i386/mm/init.c	Mon Sep 10 17:56:43 2001
@@ -57,11 +57,13 @@
 {
 	extern char empty_bad_page_table[PAGE_SIZE];
 
-	__asm__ __volatile__("cld ; rep ; stosl":
-		:"a" (pte_val(BAD_PAGE)),
-		 "D" ((long) empty_bad_page_table),
-		 "c" (PAGE_SIZE/4)
-		:"di","cx");
+	__asm__ __volatile__(
+		"cld ; rep ; stosl"
+		:
+		: "a" (pte_val(BAD_PAGE)),
+		  "D" ((long) empty_bad_page_table),
+		  "c" (PAGE_SIZE/4)
+		: "di","cx");
 	return (pte_t *) empty_bad_page_table;
 }
 
@@ -69,11 +71,13 @@
 {
 	extern char empty_bad_page[PAGE_SIZE];
 
-	__asm__ __volatile__("cld ; rep ; stosl":
-		:"a" (0),
-		 "D" ((long) empty_bad_page),
-		 "c" (PAGE_SIZE/4)
-		:"di","cx");
+	__asm__ __volatile__(
+		"cld ; rep ; stosl"
+		:
+		: "a" (0),
+		  "D" ((long) empty_bad_page),
+		  "c" (PAGE_SIZE/4)
+		: "di","cx");
 	return pte_mkdirty(mk_pte((unsigned long) empty_bad_page, PAGE_SHARED));
 }
 
@@ -183,12 +187,16 @@
 			__asm__("movl %%cr4,%%eax\n\t"
 				"orl $16,%%eax\n\t"
 				"movl %%eax,%%cr4"
-				: : :"ax");
+				:
+				:
+				: "ax");
 #else
 			__asm__(".byte 0x0f,0x20,0xe0\n\t"
 				"orl $16,%%eax\n\t"
 				".byte 0x0f,0x22,0xe0"
-				: : :"ax");
+				:
+				:
+				: "ax");
 #endif
 			wp_works_ok = 1;
 			pgd_val(pg_dir[0]) = _PAGE_TABLE | _PAGE_4M | address;
@@ -292,7 +300,7 @@
 	if (wp_works_ok < 0) {
 		pg0[0] = pte_val(mk_pte(0, PAGE_READONLY));
 		local_flush_tlb();
-		__asm__ __volatile__("movb 0,%%al ; movb %%al,0": : :"ax", "memory");
+		__asm__ __volatile__("movb 0,%%al ; movb %%al,0" : : : "ax", "memory");
 		pg0[0] = 0;
 		local_flush_tlb();
 		if (wp_works_ok < 0)
diff -u --recursive --new-file linux-2.0.39/arch/mips/kernel/sysmips.c linux-2.0.40/arch/mips/kernel/sysmips.c
--- linux-2.0.39/arch/mips/kernel/sysmips.c	Wed Dec 13 11:39:44 1995
+++ linux-2.0.40/arch/mips/kernel/sysmips.c	Mon Aug 20 13:19:24 2001
@@ -52,7 +52,8 @@
 {
 	int	*p;
 	char	*name;
-	int	flags, len, retval = -EINVAL;
+	int	len, retval = -EINVAL;
+	unsigned long flags;
 
 	switch(cmd)
 	{
diff -u --recursive --new-file linux-2.0.39/arch/sparc/kernel/sparc-stub.c linux-2.0.40/arch/sparc/kernel/sparc-stub.c
--- linux-2.0.39/arch/sparc/kernel/sparc-stub.c	Mon May  6 11:26:03 1996
+++ linux-2.0.40/arch/sparc/kernel/sparc-stub.c	Mon Aug 20 13:21:03 2001
@@ -183,7 +183,8 @@
 /* Initialize the kgdb_savettable so that debugging can commence */
 static void eh_init(void)
 {
-	int i, flags;
+	int i;
+	unsigned long flags;
 
 	save_flags(flags); cli();
 	for(i=0; i < 256; i++)
@@ -195,7 +196,7 @@
 static void exceptionHandler(int tnum, trapfunc_t trap_entry)
 {
 	unsigned long te_addr = (unsigned long) trap_entry;
-	int flags;
+	unsigned long flags;
 
 	/* We are dorking with a live trap table, all irqs off */
 	save_flags(flags); cli();
diff -u --recursive --new-file linux-2.0.39/drivers/block/ll_rw_blk.c linux-2.0.40/drivers/block/ll_rw_blk.c
--- linux-2.0.39/drivers/block/ll_rw_blk.c	Wed Jun 28 14:48:19 2000
+++ linux-2.0.40/drivers/block/ll_rw_blk.c	Tue Aug 21 17:42:05 2001
@@ -356,7 +356,7 @@
 	if (buffer_locked(bh)) {
 #if 0
 		printk("make_request(): buffer already locked\n");
-#endif
+#endif /* 0 */
 		return;
 	}
 	/* Maybe the above fixes it, and maybe it doesn't boot. Life is interesting */
@@ -388,7 +388,7 @@
 			if (buffer_uptodate(bh)) {
 #if 0
 				printk ("make_request(): buffer uptodate for READ\n");
-#endif
+#endif /* 0 */
 				unlock_buffer(bh); /* Hmmph! Already have it */
 				return;
 			}
@@ -402,7 +402,7 @@
 			if (!buffer_dirty(bh)) {
 #if 0
 				printk ("make_request(): buffer clean for WRITE\n");
-#endif
+#endif /* 0 */
 				unlock_buffer(bh); /* Hmmph! Nothing to write */
 				return;
 			}
@@ -609,7 +609,7 @@
 				"Bad md_map in ll_rw_block\n");
 		        goto sorry;
 		}
-#endif
+#endif /* CONFIG_BLK_DEV_MD */
 	}
 
 	if ((rw == WRITE || rw == WRITEA) && is_read_only(bh[0]->b_dev)) {
@@ -626,7 +626,7 @@
 				md_make_request(MINOR (bh[i]->b_dev), rw, bh[i]);
 				continue;
 			}
-#endif
+#endif /* CONFIG_BLK_DEV_MD */
 			make_request(MAJOR(bh[i]->b_rdev), rw, bh[i]);
 		}
 	}
@@ -692,8 +692,8 @@
                                         "Bad md_map in ll_rw_swap_file\n");
 				return;
 			}
-#endif
-			
+#endif /* CONFIG_BLK_DEV_MD */
+
 			if (j == 0) {
 				req[j] = get_request_wait(max_req, rdev);
 			} else {
@@ -746,62 +746,64 @@
 	memset(ro_bits,0,sizeof(ro_bits));
 #ifdef CONFIG_BLK_DEV_RAM
 	rd_init();
-#endif
+#endif /* CONFIG_BLK_DEV_RAM */
 #ifdef CONFIG_BLK_DEV_LOOP
 	loop_init();
-#endif
+#endif /* CONFIG_BLK_DEV_LOOP */
 #ifdef CONFIG_CDI_INIT
 	cdi_init();		/* this MUST precede ide_init */
-#endif CONFIG_CDI_INIT
+#endif /* CONFIG_CDI_INIT */
 #ifdef CONFIG_BLK_DEV_IDE
 	ide_init();		/* this MUST precede hd_init */
-#endif
+#endif /* CONFIG_BLK_DEV_IDE */
 #ifdef CONFIG_BLK_DEV_HD
 	hd_init();
-#endif
+#endif /* CONFIG_BLK_DEV_HD */
 #ifdef CONFIG_BLK_DEV_XD
 	xd_init();
-#endif
+#endif /* CONFIG_BLK_DEV_XD */
 #ifdef CONFIG_PARIDE
         { extern void paride_init(void); paride_init(); };
-#endif
+#endif /* CONFIG_PARIDE */
 #ifdef CONFIG_BLK_DEV_FD
 	floppy_init();
-#else
+#else /* CONFIG_BLK_DEV_FD */
+#if defined(__i386__)	/* Do we even need this? */
 	outb_p(0xc, 0x3f2);
-#endif
+#endif /* defined(__i386__) */
+#endif /* !CONFIG_BLK_DEV_FD */
 #ifdef CONFIG_CDU31A
 	cdu31a_init();
-#endif CONFIG_CDU31A
+#endif /* CONFIG_CDU31A */
 #ifdef CONFIG_MCD
 	mcd_init();
-#endif CONFIG_MCD
+#endif /* CONFIG_MCD */
 #ifdef CONFIG_MCDX
 	mcdx_init();
-#endif CONFIG_MCDX
+#endif /* CONFIG_MCDX */
 #ifdef CONFIG_SBPCD
 	sbpcd_init();
-#endif CONFIG_SBPCD
+#endif /* CONFIG_SBPCD */
 #ifdef CONFIG_AZTCD
         aztcd_init();
-#endif CONFIG_AZTCD
+#endif /* CONFIG_AZTCD */
 #ifdef CONFIG_CDU535
 	sony535_init();
-#endif CONFIG_CDU535
+#endif /* CONFIG_CDU535 */
 #ifdef CONFIG_GSCD
 	gscd_init();
-#endif CONFIG_GSCD
+#endif /* CONFIG_GSCD */
 #ifdef CONFIG_CM206
 	cm206_init();
-#endif
+#endif /* CONFIG_CM206 */
 #ifdef CONFIG_OPTCD
 	optcd_init();
-#endif CONFIG_OPTCD
+#endif /* CONFIG_OPTCD */
 #ifdef CONFIG_SJCD
 	sjcd_init();
-#endif CONFIG_SJCD
+#endif /* CONFIG_SJCD */
 #ifdef CONFIG_BLK_DEV_MD
 	md_init();
-#endif CONFIG_BLK_DEV_MD
+#endif /* CONFIG_BLK_DEV_MD */
 	return 0;
 }
diff -u --recursive --new-file linux-2.0.39/drivers/block/promise.h linux-2.0.40/drivers/block/promise.h
--- linux-2.0.39/drivers/block/promise.h	Sat Mar 16 12:52:15 1996
+++ linux-2.0.40/drivers/block/promise.h	Tue Aug 21 17:42:48 2001
@@ -49,4 +49,4 @@
 void setup_dc4030 (ide_hwif_t *);
 int init_dc4030 (void);
 
-#endif IDE_PROMISE_H
+#endif /* !IDE_PROMISE_H */
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/aztcd.c linux-2.0.40/drivers/cdrom/aztcd.c
--- linux-2.0.39/drivers/cdrom/aztcd.c	Mon May 20 07:38:42 1996
+++ linux-2.0.40/drivers/cdrom/aztcd.c	Thu Aug 23 18:53:14 2001
@@ -334,7 +334,7 @@
 #ifdef MODULE
  int        init_module(void);
  void       cleanup_module(void);
-#endif MODULE
+#endif /* MODULE */
 static struct file_operations azt_fops = {
 	NULL,                   /* lseek - default */
 	block_read,             /* read - general block-dev read */
@@ -1748,7 +1748,7 @@
       release_region(azt_port,4);  /*proprietary interface*/
   printk(KERN_INFO "aztcd module released.\n");
 }   
-#endif MODULE
+#endif /* MODULE */
 
 
 /*##########################################################################
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/cdi.c linux-2.0.40/drivers/cdrom/cdi.c
--- linux-2.0.39/drivers/cdrom/cdi.c	Tue Feb 13 09:30:25 1996
+++ linux-2.0.40/drivers/cdrom/cdi.c	Thu Aug 23 18:56:04 2001
@@ -30,7 +30,7 @@
 #include <linux/blk.h>  /* where the proto type of cdi_init() is */
 #ifdef CONFIG_ISP16_CDI
 #include <linux/isp16.h>
-#endif CONFIG_ISP16_CDI
+#endif /* CONFIG_ISP16_CDI */
 
 /*
  *  Cdrom interface configuration.
@@ -42,7 +42,7 @@
 
 #ifdef CONFIG_ISP16_CDI
   ret_val &= isp16_init();
-#endif CONFIG_ISP16_CDI
+#endif /* CONFIG_ISP16_CDI */
 
   return(ret_val);
 }
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/cdu31a.c linux-2.0.40/drivers/cdrom/cdu31a.c
--- linux-2.0.39/drivers/cdrom/cdu31a.c	Tue Apr  8 17:47:45 1997
+++ linux-2.0.40/drivers/cdrom/cdu31a.c	Thu Aug 23 18:53:25 2001
@@ -3243,4 +3243,4 @@
    release_region(cdu31a_port,4);
    printk(KERN_INFO "cdu31a module released.\n");
 }   
-#endif MODULE
+#endif /* MODULE */
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/mcd.c linux-2.0.40/drivers/cdrom/mcd.c
--- linux-2.0.39/drivers/cdrom/mcd.c	Mon Jul 13 22:47:28 1998
+++ linux-2.0.40/drivers/cdrom/mcd.c	Thu Aug 23 18:53:34 2001
@@ -1644,4 +1644,4 @@
   free_irq(mcd_irq, NULL);
   printk(KERN_INFO "mcd module released.\n");
 }
-#endif MODULE
+#endif /* MODULE */
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/mcdx.c linux-2.0.40/drivers/cdrom/mcdx.c
--- linux-2.0.39/drivers/cdrom/mcdx.c	Tue Jul 23 09:26:54 1996
+++ linux-2.0.40/drivers/cdrom/mcdx.c	Thu Aug 23 18:53:44 2001
@@ -1154,7 +1154,7 @@
 #endif
 }
 
-#endif MODULE
+#endif /* MODULE */
 
 /* Support functions ************************************************/
 
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/optcd.c linux-2.0.40/drivers/cdrom/optcd.c
--- linux-2.0.39/drivers/cdrom/optcd.c	Tue Jun  4 09:53:46 1996
+++ linux-2.0.40/drivers/cdrom/optcd.c	Thu Aug 23 18:54:15 2001
@@ -915,7 +915,7 @@
 		return -EIO;
 	return 0;
 }
-#endif MULTISESSION
+#endif /* MULTISESSION */
 
 
 static int update_toc(void)
@@ -953,7 +953,7 @@
 #ifdef MULTISESSION
  	if (disk_info.xa)
 		get_multi_disk_info();	/* Here disk_info.multi is set */
-#endif MULTISESSION
+#endif /* MULTISESSION */
 	if (disk_info.multi)
 		printk(KERN_WARNING "optcd: Multisession support experimental, "
 			"see linux/Documentation/cdrom/optcd\n");
@@ -1704,11 +1704,11 @@
 			disk_info.last_session.minute,
 			disk_info.last_session.second,
 			disk_info.last_session.frame);
-#endif DEBUG_MULTIS
+#endif /* DEBUG_MULTIS */
 
 	return 0;
 }
-#endif MULTISESSION
+#endif /* MULTISESSION */
 
 
 static int cdromreset(void)
@@ -2081,4 +2081,4 @@
 	release_region(optcd_port, 4);
 	printk(KERN_INFO "optcd: module released.\n");
 }
-#endif MODULE
+#endif /* MODULE */
diff -u --recursive --new-file linux-2.0.39/drivers/cdrom/sbpcd.c linux-2.0.40/drivers/cdrom/sbpcd.c
--- linux-2.0.39/drivers/cdrom/sbpcd.c	Sun Jun 13 19:21:00 1999
+++ linux-2.0.40/drivers/cdrom/sbpcd.c	Thu Aug 23 19:38:11 2001
@@ -313,7 +313,7 @@
 
 #ifndef SBPCD_ISSUE
 #define SBPCD_ISSUE 1
-#endif SBPCD_ISSUE
+#endif /* SBPCD_ISSUE */
 
 #include <linux/module.h>
 
@@ -377,7 +377,7 @@
 #else
 #define SBPCD_CLI
 #define SBPCD_STI
-#endif SBPCD_DIS_IRQ
+#endif /* SBPCD_DIS_IRQ */
 /*==========================================================================*/
 /*
  * auto-probing address list
@@ -434,8 +434,8 @@
 	0x370, 0, /* Lasermate, CI-101P */
 	0x290, 1, /* Soundblaster 16 */
 	0x310, 0, /* Lasermate, CI-101P, WDH-7001C */
-#endif MODULE
-#endif DISTRIBUTION
+#endif /* MODULE */
+#endif /* DISTRIBUTION */
 };
 #else
 static int sbpcd[] = {CDROM_PORT, SBPRO}; /* probe with user's setup only */
@@ -523,7 +523,7 @@
 			  (1<<DBG_TOC) |
 			  (1<<DBG_MUL) |
 			  (1<<DBG_UPC));
-#endif DISTRIBUTION
+#endif /* DISTRIBUTION */
 
 static int sbpcd_ioaddr = CDROM_PORT;	/* default I/O base address */
 static int sbpro_type = SBPRO;
@@ -573,7 +573,7 @@
 
 #if FUTURE
 static struct wait_queue *sbp_waitq = NULL;
-#endif FUTURE
+#endif /* FUTURE */
 
 static int teac=SBP_TEAC_SPEED;
 static int buffers=SBP_BUFFER_FRAMES;
@@ -598,7 +598,7 @@
 #if OLD_BUSY
 static volatile u_char busy_data=0;
 static volatile u_char busy_audio=0; /* true semaphores would be safer */
-#endif OLD_BUSY
+#endif /* OLD_BUSY */
 static struct semaphore ioctl_read_sem = MUTEX;
 static u_long timeout;
 static volatile u_char timed_out_delay=0;
@@ -615,7 +615,7 @@
 static u_int maxtim_data= 9000;
 #else
 static u_int maxtim_data= 3000;
-#endif LONG_TIMING
+#endif /* LONG_TIMING */
 #if DISTRIBUTION
 static int n_retries=3;
 #else
@@ -680,7 +680,7 @@
 	u_char vol_ctrl2;
 	char vol_chan3;
 	u_char vol_ctrl3;
-#endif 000
+#endif /* 000 */
 	u_char volume_control; /* TEAC on/off bits */
 	
 	u_char SubQ_ctl_adr;
@@ -709,7 +709,7 @@
 	u_int TocEnt_address;
 #if SAFE_MIXED
 	char has_data;
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 	u_char ored_ctl_adr; /* to detect if CDROM contains data tracks */
 	
 	struct {
@@ -758,7 +758,7 @@
 #define MSG_LEVEL KERN_NOTICE
 #else
 #define MSG_LEVEL KERN_INFO
-#endif DISTRIBUTION
+#endif /* DISTRIBUTION */
 
 	char buf[256];
 	va_list args;
@@ -774,7 +774,7 @@
 	printk(buf);
 #if KLOGD_PAUSE
 	sbp_sleep(KLOGD_PAUSE); /* else messages get lost */
-#endif KLOGD_PAUSE
+#endif /* KLOGD_PAUSE */
 	return;
 }
 /*==========================================================================*/
@@ -1069,7 +1069,7 @@
 	return (0);
 }
 /*==========================================================================*/
-#endif 00000
+#endif /* 00000 */
 /*==========================================================================*/
 static int ResponseInfo(void)
 {
@@ -1099,7 +1099,7 @@
 	}
 	j=i-response_count;
 	if (j>0) msg(DBG_INF,"ResponseInfo: got %d trailing bytes.\n",j);
-#endif 000
+#endif /* 000 */
 	for (j=0;j<i;j++)
 		sprintf(&msgbuf[j*3]," %02X",infobuf[j]);
 	msgbuf[j*3]=0;
@@ -1351,7 +1351,7 @@
 		if (drvcmd[0]==CMDT_READ_VER) sbp_sleep(HZ); /* fixme */
 #if 01
 		OUT(CDo_sel_i_d,1);
-#endif 01
+#endif /* 01 */
 		if (teac==2)
                   {
                     if ((i=CDi_stat_loop_T()) == -1) break;
@@ -1360,7 +1360,7 @@
                   {
 #if 0
                     OUT(CDo_sel_i_d,1);
-#endif 0
+#endif /* 0 */
                     i=inb(CDi_status);
                   }
 		if (!(i&s_not_data_ready)) /* f.e. CMDT_DISKINFO */
@@ -1384,7 +1384,7 @@
                                                         l=1;
                                                         msg(DBG_TEA,"cmd_out_T: do_16bit: false first byte!\n");
                                                 }
-#endif TEST_FALSE_FF
+#endif /* TEST_FALSE_FF */
                                         }
                                         else infobuf[l++]=inb(CDi_data);
                                         i=inb(CDi_status);
@@ -1978,7 +1978,7 @@
 		msg(DBG_TEA, "================CMDT_RESET given=================.\n");
 		sbp_sleep(3*HZ);
 	}
-#endif 1
+#endif /* 1 */
 	flush_status();
 	i=GetStatus();
 	if (i<0) return i;
@@ -1990,7 +1990,7 @@
 static int SetSpeed(void)
 {
 	int i, speed;
-	
+
 	if (!(D_S[d].drv_options&(speed_auto|speed_300|speed_150))) return (0);
 	speed=speed_auto;
 	if (!(D_S[d].drv_options&speed_auto))
@@ -2560,7 +2560,7 @@
 	D_S[d].vol_ctrl2=0xFF;
 	D_S[d].vol_chan3=3;
 	D_S[d].vol_ctrl3=0xFF;
-#endif 000
+#endif /* 000 */
 	D_S[d].diskstate_flags |= volume_bit;
 	return (0);
 }
@@ -2568,7 +2568,7 @@
 static int cc_ReadCapacity(void)
 {
 	int i, j;
-	
+
 	if (fam2_drive) return (0); /* some firmware lacks this command */
 	if (famLV_drive) return (0); /* some firmware lacks this command */
 	if (famT_drive) return (0); /* done with cc_ReadTocDescr() */
@@ -2858,20 +2858,20 @@
 	int i;
 #if TEST_UPC
 	int block, checksum;
-#endif TEST_UPC
-	
+#endif /* TEST_UPC */
+
 	if (fam2_drive) return (0); /* not implemented yet */
 	if (famT_drive)	return (0); /* not implemented yet */
 	if (famV_drive)	return (0); /* not implemented yet */
 #if 1
 	if (fam0_drive) return (0); /* but it should work */
-#endif 1
-	
+#endif /* 1 */
+
 	D_S[d].diskstate_flags &= ~upc_bit;
 #if TEST_UPC
 	for (block=CD_MSF_OFFSET+1;block<CD_MSF_OFFSET+200;block++)
 	{
-#endif TEST_UPC
+#endif /* TEST_UPC */
 		clr_cmdbuf();
 		if (fam1_drive)
 		{
@@ -2880,7 +2880,7 @@
 			drvcmd[1]=(block>>16)&0xFF;
 			drvcmd[2]=(block>>8)&0xFF;
 			drvcmd[3]=block&0xFF;
-#endif TEST_UPC
+#endif /* TEST_UPC */
 			response_count=8;
 			flags_cmd_out=f_putcmd|f_ResponseStatus|f_obey_p_check;
 		}
@@ -2891,7 +2891,7 @@
 			drvcmd[2]=(block>>16)&0xFF;
 			drvcmd[3]=(block>>8)&0xFF;
 			drvcmd[4]=block&0xFF;
-#endif TEST_UPC
+#endif /* TEST_UPC */
 			response_count=0;
 			flags_cmd_out=f_putcmd|f_lopsta|f_getsta|f_ResponseStatus|f_obey_p_check|f_bit1;
 		}
@@ -2922,12 +2922,12 @@
 		}
 #if TEST_UPC
 		checksum=0;
-#endif TEST_UPC
+#endif /* TEST_UPC */
 		for (i=0;i<(fam1_drive?8:16);i++)
 		{
 #if TEST_UPC
 			checksum |= infobuf[i];
-#endif TEST_UPC
+#endif /* TEST_UPC */
 			sprintf(&msgbuf[i*3], " %02X", infobuf[i]);
 		}
 		msgbuf[i*3]=0;
@@ -2935,7 +2935,7 @@
 #if TEST_UPC
 		if ((checksum&0x7F)!=0) break;
 	}
-#endif TEST_UPC
+#endif /* TEST_UPC */
 	D_S[d].UPC_ctl_adr=0;
 	if (fam1_drive) i=0;
 	else i=2;
@@ -3047,12 +3047,12 @@
 	i=cmd_out(); /* which buffer to use? */
 	return (i);
 }
-#endif FUTURE
+#endif /* FUTURE */
 /*==========================================================================*/
 static void check_datarate(void)
 {
 	int i=0;
-	
+
 	msg(DBG_IOX,"check_datarate entered.\n");
 	datarate=0;
 #if TEST_STI
@@ -3074,7 +3074,7 @@
 		datarate++;
 #if 1
 		if (datarate>0x6FFFFFFF) break;
-#endif 00000
+#endif /* 00000 */
 	}
 	while (!timed_out_delay);
 	del_timer(&delay_timer);
@@ -3090,7 +3090,7 @@
 	maxtim_data=datarate/100;
 #else
 	maxtim_data=datarate/300;
-#endif LONG_TIMING
+#endif /* LONG_TIMING */
 #if 0
 	msg(DBG_TIM,"maxtim_8 %d, maxtim_data %d.\n", maxtim_8, maxtim_data);
 #endif
@@ -3244,7 +3244,7 @@
 		OUT(CDo_reset,0);
 		sbp_sleep(6*HZ);
 		OUT(CDo_enable,D_S[d].drv_sel);
-#endif 0
+#endif /* 0 */
 		drvcmd[0]=CMD2_READ_VER;
 		response_count=12;
 		flags_cmd_out=f_putcmd;
@@ -3534,7 +3534,7 @@
 	OUT(port+3,save_port3);
 	return (0); /* in any case - no real "function" at time */
 }
-#endif PATH_CHECK
+#endif /* PATH_CHECK */
 /*==========================================================================*/
 /*==========================================================================*/
 /*
@@ -3543,7 +3543,7 @@
 static int check_drives(void)
 {
 	int i, j;
-	
+
 	msg(DBG_INI,"check_drives entered.\n");
 	ndrives=0;
 	for (j=0;j<MAX_DRIVES;j++)
@@ -3641,7 +3641,7 @@
 	if (func2==tell_UPC) return (-1);
 #else
 	return (0);
-#endif 000
+#endif /* 000 */
 }
 /*==========================================================================*/
 static int check_allowed2(u_char func1, u_char func2)
@@ -3659,7 +3659,7 @@
 	}
 #else
 	return (0);
-#endif 000
+#endif /* 000 */
 }
 /*==========================================================================*/
 static int check_allowed3(u_char func1, u_char func2)
@@ -3693,7 +3693,7 @@
 	if (func1==audio_resume) return (-1);
 #else
 	return (0);
-#endif 000
+#endif /* 000 */
 }
 /*==========================================================================*/
 static int seek_pos_audio_end(void)
@@ -3705,7 +3705,7 @@
 	i=cc_Seek(i,0);
 	return (i);
 }
-#endif FUTURE
+#endif /* FUTURE */
 /*==========================================================================*/
 static int ReadToC(void)
 {
@@ -3883,7 +3883,7 @@
     }
 	return (0);
 }
-#endif FUTURE
+#endif /* FUTURE */
 /*==========================================================================*/
 /*==========================================================================*/
 /*
@@ -3892,16 +3892,16 @@
 static int sbp_status(void)
 {
 	int st;
-	
+
 	st=ResponseStatus();
 	if (st<0)
 	{
 		msg(DBG_INF,"sbp_status: timeout.\n");
 		return (0);
 	}
-	
+
 	if (!st_spinning) msg(DBG_SPI,"motor got off - ignoring.\n");
-	
+
 	if (st_check) 
 	{
 		msg(DBG_INF,"st_check detected - retrying.\n");
@@ -4011,12 +4011,12 @@
 		if (i<0) RETURN_UP(-EIO);
 		D_S[d].audio_state=audio_playing;
 		RETURN_UP(0);
-		
+
 	case CDROMPLAYMSF:
 		msg(DBG_IOC,"ioctl: CDROMPLAYMSF entered.\n");
 #if SAFE_MIXED
 		if (D_S[d].has_data>1) RETURN_UP(-EBUSY);
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		if (D_S[d].audio_state==audio_playing)
 		{
 			i=cc_Pause_Resume(1);
@@ -4048,12 +4048,12 @@
 		}
 		D_S[d].audio_state=audio_playing;
 		RETURN_UP(0);
-		
+
 	case CDROMPLAYTRKIND: /* Play a track.  This currently ignores index. */
 		msg(DBG_IOC,"ioctl: CDROMPLAYTRKIND entered.\n");
 #if SAFE_MIXED
 		if (D_S[d].has_data>1) RETURN_UP(-EBUSY);
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		if (D_S[d].audio_state==audio_playing)
 		{
 			msg(DBG_IOX,"CDROMPLAYTRKIND: already audio_playing.\n");
@@ -4121,28 +4121,28 @@
 		else RETURN_UP(-EINVAL);
 		memcpy_tofs((void *) arg, &tocentry, sizeof(struct cdrom_tocentry));
 		RETURN_UP(0);
-		
+
 	case CDROMRESET:      /* hard reset the drive */
 		msg(DBG_IOC,"ioctl: CDROMRESET entered.\n");
 		i=DriveReset();
 		D_S[d].audio_state=0;
 		RETURN_UP(i);
-		
+
 	case CDROMSTOP:      /* Spin down the drive */
 		msg(DBG_IOC,"ioctl: CDROMSTOP entered.\n");
 #if SAFE_MIXED
 		if (D_S[d].has_data>1) RETURN_UP(-EBUSY);
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		i=cc_Pause_Resume(1);
 		D_S[d].audio_state=0;
 		RETURN_UP(i);
-		
+
 	case CDROMSTART:  /* Spin up the drive */
 		msg(DBG_IOC,"ioctl: CDROMSTART entered.\n");
 		cc_SpinUp();
 		D_S[d].audio_state=0;
 		RETURN_UP(0);
-		
+
 	case CDROMEJECT:
 		msg(DBG_IOC,"ioctl: CDROMEJECT entered.\n");
 		if (fam0_drive) return (0);
@@ -4157,7 +4157,7 @@
 		D_S[d].diskstate_flags=0;
 		D_S[d].audio_state=0;
 		RETURN_UP(0);
-		
+
 	case CDROMEJECT_SW:
 		msg(DBG_IOC,"ioctl: CDROMEJECT_SW entered.\n");
 		if (fam0_drive) RETURN_UP(0);
@@ -4235,27 +4235,27 @@
 		    SC.cdsc_trk,SC.cdsc_ind,
 		    SC.cdsc_absaddr,SC.cdsc_reladdr);
 		RETURN_UP(0);
-		
+
 	case CDROMREADMODE1:
 		msg(DBG_IOC,"ioctl: CDROMREADMODE1 requested.\n");
 #if SAFE_MIXED
 		if (D_S[d].has_data>1) RETURN_UP(-EBUSY);
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		cc_ModeSelect(CD_FRAMESIZE);
 		cc_ModeSense();
 		D_S[d].mode=READ_M1;
 		RETURN_UP(0);
-		
+
 	case CDROMREADMODE2: /* not usable at the moment */
 		msg(DBG_IOC,"ioctl: CDROMREADMODE2 requested.\n");
 #if SAFE_MIXED
 		if (D_S[d].has_data>1) RETURN_UP(-EBUSY);
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		cc_ModeSelect(CD_FRAMESIZE_RAW1);
 		cc_ModeSense();
 		D_S[d].mode=READ_M2;
 		RETURN_UP(0);
-		
+
 	case CDROMAUDIOBUFSIZ: /* configure the audio buffer size */
 		msg(DBG_IOC,"ioctl: CDROMAUDIOBUFSIZ entered.\n");
 		if (D_S[d].sbp_audsiz>0) vfree(D_S[d].aud_buf);
@@ -4284,7 +4284,7 @@
 		u_int data_retrying = 0;
 		int status_tries;
 		int error_flag;
-		
+
 		msg(DBG_IOC,"ioctl: CDROMREADAUDIO entered.\n");
 		if (fam0_drive) RETURN_UP(-EINVAL);
 		if (famL_drive) RETURN_UP(-EINVAL);
@@ -4292,7 +4292,7 @@
 		if (famT_drive) RETURN_UP(-EINVAL);
 #if SAFE_MIXED
 		if (D_S[d].has_data>1) RETURN_UP(-EBUSY);
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		if (D_S[d].aud_buf==NULL) RETURN_UP(-EINVAL);
 		i=verify_area(VERIFY_READ, (void *) arg, sizeof(struct cdrom_read_audio));
 		if (i) RETURN_UP(i);
@@ -4301,7 +4301,7 @@
 		i=verify_area(VERIFY_WRITE, read_audio.buf,
 			      read_audio.nframes*CD_FRAMESIZE_RAW);
 		if (i) RETURN_UP(i);
-		
+
 		if (read_audio.addr_format==CDROM_MSF) /* MSF-bin specification of where to start */
 			block=msf2lba(&read_audio.addr.msf.minute);
 		else if (read_audio.addr_format==CDROM_LBA) /* lba specification of where to start */
@@ -4317,7 +4317,7 @@
 #if OLD_BUSY
 		while (busy_data) sbp_sleep(HZ/10); /* wait a bit */
 		busy_audio=1;
-#endif OLD_BUSY
+#endif /* OLD_BUSY */
 		error_flag=0;
 		for (data_tries=5; data_tries>0; data_tries--)
 		{
@@ -4427,7 +4427,7 @@
 				i=cc_DriveReset();                /* ugly fix to prevent a hang */
 #else
 				i=cc_ReadError();
-#endif 0000
+#endif /* 0000 */
 				continue;
 			}
 			if (fam0L_drive)
@@ -4482,7 +4482,7 @@
 		D_S[d].mode=READ_M1;
 #if OLD_BUSY
 		busy_audio=0;
-#endif OLD_BUSY
+#endif /* OLD_BUSY */
 		if (data_tries == 0)
 		{
 			msg(DBG_AUD,"read_audio: failed after 5 tries.\n");
@@ -4491,7 +4491,7 @@
 		msg(DBG_AUD,"read_audio: successful return.\n");
 		RETURN_UP(0);
 	} /* end of CDROMREADAUDIO */
-		
+
 	case CDROMMULTISESSION: /* tell start-of-last-session */
 		msg(DBG_IOC,"ioctl: CDROMMULTISESSION entered.\n");
 		st=verify_area(VERIFY_WRITE,(void *) arg, sizeof(struct cdrom_multisession));
@@ -4632,19 +4632,19 @@
 #if OLD_BUSY
 	while (busy_audio) sbp_sleep(HZ); /* wait a bit */
 	busy_data=1;
-#endif OLD_BUSY
-	
+#endif /* OLD_BUSY */
+
 	if (D_S[i].audio_state==audio_playing) goto err_done;
 	if (d!=i) switch_drive(i);
-	
+
 	block = req->sector; /* always numbered as 512-byte-pieces */
 	nsect = req->nr_sectors; /* always counted as 512-byte-pieces */
-	
+
 	msg(DBG_BSZ,"read sector %d (%d sectors)\n", block, nsect);
 #if 0
 	msg(DBG_MUL,"read LBA %d\n", block/4);
 #endif
-	
+
 	sbp_transfer(req);
 	/* if we satisfied the request from the buffer, we're done. */
 	if (req->nr_sectors == 0)
@@ -4661,10 +4661,10 @@
 	i=prepare(0,0); /* at moment not really a hassle check, but ... */
 	if (i!=0)
 		msg(DBG_INF,"\"prepare\" tells error %d -- ignored\n", i);
-#endif FUTURE
-	
+#endif /* FUTURE */
+
 	if (!st_spinning) cc_SpinUp();
-	
+
 	for (data_tries=n_retries; data_tries > 0; data_tries--)
 	{
 		for (status_tries=3; status_tries > 0; status_tries--)
@@ -4680,14 +4680,14 @@
 			msg(DBG_INF,"sbp_status: failed after 3 tries\n");
 			break;
 		}
-		
+
 		sbp_read_cmd(req);
 		sbp_sleep(0);
 		if (sbp_data(req) != 0)
 		{
 #if SAFE_MIXED
 			D_S[d].has_data=2; /* is really a data disk */
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 #ifdef DEBUG_GTL
 			printk(" do_sbpcd_request[%do](%p:%ld+%ld) end 3, Time:%li\n",
 				xnr, req, req->sector, req->nr_sectors, jiffies);
@@ -4700,7 +4700,7 @@
  err_done:
 #if OLD_BUSY
 	busy_data=0;
-#endif OLD_BUSY
+#endif /* OLD_BUSY */
 #ifdef DEBUG_GTL
 	printk(" do_sbpcd_request[%do](%p:%ld+%ld) end 4 (error), Time:%li\n",
 		xnr, req, req->sector, req->nr_sectors, jiffies);
@@ -5056,20 +5056,20 @@
 		}
 		SBPCD_STI;
 	}
-	
+
 #if 0
 	if (!success)
-#endif 0
+#endif /* 0 */
 		do
 		{
 			if (fam0LV_drive) cc_ReadStatus();
 #if 1
 			if (famT_drive) msg(DBG_TEA, "================before ResponseStatus=================.\n", i);
-#endif 1
+#endif /* 1 */
 			i=ResponseStatus();  /* builds status_bits, returns orig. status (old) or faked p_success (new) */
 #if 1
 			if (famT_drive)	msg(DBG_TEA, "================ResponseStatus: %d=================.\n", i);
-#endif 1
+#endif /* 1 */
 			if (i<0)
 			{
 				msg(DBG_INF,"bad cc_ReadStatus after read: %02X\n", D_S[d].status_bits);
@@ -5105,7 +5105,7 @@
 static int sbpcd_open(struct inode *ip, struct file *fp)
 {
 	int i;
-	
+
 	i = MINOR(ip->i_rdev);
 	if ((i<0) || (i>=NR_SBPCD) || (D_S[i].drv_id==-1))
 	{
@@ -5114,10 +5114,10 @@
 	}
 	if (fp->f_mode & 2)
 		return -EROFS;
-	
+
 	down(&ioctl_read_sem);
 	switch_drive(i);
-	
+
 	i=cc_ReadError();
 	flags_cmd_out |= f_respo2;
 	cc_ReadStatus(); /* command: give 1-byte status */
@@ -5128,7 +5128,7 @@
 		i=ResponseStatus();
 #if 0
                 sbp_sleep(HZ);
-#endif 0
+#endif /* 0 */
 		i=ResponseStatus();
 	}
 	if (i<0)
@@ -5182,15 +5182,15 @@
 		i=DiskInfo();
 		if (famT_drive)	msg(DBG_TEA,"sbpcd_open: after i=DiskInfo();.\n");
 		if ((D_S[d].ored_ctl_adr&0x40)==0)
-		{		
+		{
 			msg(DBG_INF,"CD contains no data tracks.\n");
 #if SAFE_MIXED
 			D_S[d].has_data=0;
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		}
 #if SAFE_MIXED
 		else if (D_S[d].has_data<1) D_S[d].has_data=1;
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 	}
 	if (!st_spinning) cc_SpinUp();
 	RETURN_UP(0);
@@ -5202,7 +5202,7 @@
 static void sbpcd_release(struct inode * ip, struct file * file)
 {
 	int i;
-	
+
 	i = MINOR(ip->i_rdev);
 	if ((i<0) || (i>=NR_SBPCD) || (D_S[i].drv_id==-1))
 	{
@@ -5231,7 +5231,7 @@
 			D_S[d].open_count=0; 
 #if SAFE_MIXED
 			D_S[d].has_data=0;
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		}
 	}
 	up(&ioctl_read_sem);
@@ -5396,14 +5396,14 @@
 int init_module(void)
 #else
 int SBPCD_INIT(void)
-#endif MODULE
+#endif /* MODULE */
 {
 	int i=0, j=0;
 	int addr[2]={1, CDROM_PORT};
 	int port_index;
-	
+
 	sti();
-	
+
 	msg(DBG_INF,"sbpcd.c %s\n", VERSION);
 #ifndef MODULE
 #if DISTRIBUTION
@@ -5422,11 +5422,11 @@
 		msg(DBG_INF,"with your REAL address.\n");
 		msg(DBG_INF,"= = = = = = = = = = END of WARNING = = = = = == = = =\n");
 	}
-#endif DISTRIBUTION
+#endif /* DISTRIBUTION */
 	sbpcd[0]=sbpcd_ioaddr; /* possibly changed by kernel command line */
 	sbpcd[1]=sbpro_type; /* possibly changed by kernel command line */
-#endif MODULE
-	
+#endif /* MODULE */
+
 	for (port_index=0;port_index<NUM_PROBE;port_index+=2)
 	{
 		addr[1]=sbpcd[port_index];
@@ -5443,7 +5443,7 @@
 		sbpcd_setup(type, addr);
 #if DISTRIBUTION
 		msg(DBG_INF,"Scanning 0x%X (%s)...\n", CDo_command, type);
-#endif DISTRIBUTION
+#endif /* DISTRIBUTION */
 		if (sbpcd[port_index+1]==2)
 		{
 			i=config_spea();
@@ -5451,12 +5451,12 @@
 		}
 #ifdef PATH_CHECK
 		if (check_card(addr[1])) continue;
-#endif PATH_CHECK
+#endif /* PATH_CHECK */
 		i=check_drives();
 		msg(DBG_INI,"check_drives done.\n");
 		if (i>=0) break; /* drive found */
 	} /* end of cycling through the set of possible I/O port addresses */
-	
+
 	if (ndrives==0)
 	{
 		msg(DBG_INF, "No drive found.\n");
@@ -5464,9 +5464,9 @@
 		return -EIO;
 #else
 		goto init_done;
-#endif MODULE
+#endif /* MODULE */
 	}
-	
+
 	if (port_index>0)
           {
             msg(DBG_INF, "You should read linux/Documentation/cdrom/sbpcd\n");
@@ -5474,14 +5474,14 @@
           }
 	check_datarate();
 	msg(DBG_INI,"check_datarate done.\n");
-	
+
 #if 0
 	if (!famL_drive)
 	{
 		OUT(CDo_reset,0);
 		sbp_sleep(HZ);
 	}
-#endif 0
+#endif /* 0 */
 
 	for (j=0;j<NR_SBPCD;j++)
 	{
@@ -5489,7 +5489,7 @@
 		switch_drive(j);
 #if 1
 		if (!famL_drive) cc_DriveReset();
-#endif 0
+#endif /* 0 */
 		if (!st_spinning) cc_SpinUp();
 		D_S[d].sbp_first_frame = -1;  /* First frame in buffer */
 		D_S[d].sbp_last_frame = -1;   /* Last frame in buffer  */
@@ -5500,7 +5500,7 @@
 		D_S[d].f_eject=0;
 #if EJECT
 		if (!fam0_drive) D_S[d].f_eject=1;
-#endif EJECT
+#endif /* EJECT */
 		cc_ReadStatus();
 		i=ResponseStatus();  /* returns orig. status or p_busy_new */
 		if (famT_drive) i=ResponseStatus();  /* returns orig. status or p_busy_new */
@@ -5537,7 +5537,7 @@
 		i=SetSpeed();
 		if (i>=0) D_S[d].CD_changed=1;
 	}
-	
+
 	/*
 	 * Turn on the CD audio channels.
 	 * The addresses are obtained from SOUND_BASE (see sbpcd.h).
@@ -5545,8 +5545,8 @@
 #if SOUND_BASE
 	OUT(MIXER_addr,MIXER_CD_Volume); /* select SB Pro mixer register */
 	OUT(MIXER_data,0xCC); /* one nibble per channel, max. value: 0xFF */
-#endif SOUND_BASE
-	
+#endif /* SOUND_BASE */
+
 	if (register_blkdev(MAJOR_NR, major_name, &sbpcd_fops) != 0)
 	{
 		msg(DBG_INF, "Can't get MAJOR %d for Matsushita CDROM\n", MAJOR_NR);
@@ -5554,20 +5554,20 @@
 		return -EIO;
 #else
 		goto init_done;
-#endif MODULE
+#endif /* MODULE */
 	}
 	blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST;
 	read_ahead[MAJOR_NR] = buffers * (CD_FRAMESIZE / 512);
-	
+
 	request_region(CDo_command,4,major_name);
-	
+
 	for (j=0;j<NR_SBPCD;j++)
 	{
 		if (D_S[j].drv_id==-1) continue;
 		switch_drive(j);
 #if SAFE_MIXED
 		D_S[j].has_data=0;
-#endif SAFE_MIXED
+#endif /* SAFE_MIXED */
 		/*
 		 * allocate memory for the frame buffers
 		 */
@@ -5584,7 +5584,7 @@
 		}
 #ifdef MODULE
 		msg(DBG_INF,"data buffer size: %d frames.\n",buffers);
-#endif MODULE
+#endif /* MODULE */
 		if (D_S[j].sbp_audsiz>0)
 		{
 			D_S[j].aud_buf=(u_char *) vmalloc(D_S[j].sbp_audsiz*CD_FRAMESIZE_RAW);
@@ -5603,15 +5603,15 @@
 #if !(SBPCD_ISSUE-1)
 #ifdef CONFIG_SBPCD2
 	sbpcd2_init();
-#endif CONFIG_SBPCD2
+#endif /* CONFIG_SBPCD2 */
 #ifdef CONFIG_SBPCD3
 	sbpcd3_init();
-#endif CONFIG_SBPCD3
+#endif /* CONFIG_SBPCD3 */
 #ifdef CONFIG_SBPCD4
 	sbpcd4_init();
-#endif CONFIG_SBPCD4
+#endif /* CONFIG_SBPCD4 */
 #endif !(SBPCD_ISSUE-1)
-#endif MODULE
+#endif /* MODULE */
 	return 0;
 }
 /*==========================================================================*/
@@ -5619,14 +5619,14 @@
 void cleanup_module(void)
 {
 	int j;
-	
+
 	if ((unregister_blkdev(MAJOR_NR, major_name) == -EINVAL))
 	{
 		msg(DBG_INF, "What's that: can't unregister %s.\n", major_name);
 		return;
 	}
 	release_region(CDo_command,4);
-	
+
 	for (j=0;j<NR_SBPCD;j++)
 	{
 		if (D_S[j].drv_id==-1) continue;
@@ -5635,7 +5635,7 @@
 	}
 	msg(DBG_INF, "%s module released.\n", major_name);
 }
-#endif MODULE
+#endif /* MODULE */
 /*==========================================================================*/
 /*
  * Check if the media has changed in the CD-ROM drive.
diff -u --recursive --new-file linux-2.0.39/drivers/char/lp_m68k.c linux-2.0.40/drivers/char/lp_m68k.c
--- linux-2.0.39/drivers/char/lp_m68k.c	Mon May  6 11:49:43 1996
+++ linux-2.0.40/drivers/char/lp_m68k.c	Mon Aug 20 13:27:26 2001
@@ -182,7 +182,7 @@
 #endif
 {
   unsigned long total_bytes_written = 0;
-  unsigned int flags;
+  unsigned long flags;
   int rc;
   int dev = MINOR(inode->i_rdev);
 
diff -u --recursive --new-file linux-2.0.39/drivers/char/misc.c linux-2.0.40/drivers/char/misc.c
--- linux-2.0.39/drivers/char/misc.c	Thu Jun  4 00:17:47 1998
+++ linux-2.0.40/drivers/char/misc.c	Sat Feb 24 02:22:07 2001
@@ -197,7 +197,7 @@
 		S_IFREG | S_IRUGO, 1, 0, 0,
 		0, NULL /* ops -- default to array */,
 		&proc_misc_read /* get_info */,
-	});	
+	});
 #endif /* PROC_FS */
 #ifdef CONFIG_BUSMOUSE
 	bus_mouse_init();
@@ -220,14 +220,18 @@
 #ifdef CONFIG_SUN_MOUSE
 	sun_mouse_init();
 #endif
-#ifdef CONFIG_SOFT_WATCHDOG
-	watchdog_init();
-#endif
+	/* In 2.0.xx, only the first misc_register() is significant for
+	 * each minor. So we load the hardware watchdogs first, then
+	 * the softdog driver.
+	 */
 #ifdef CONFIG_WDT
 	wdt_init();
 #endif
 #ifdef CONFIG_PCWATCHDOG
 	pcwatchdog_init();
+#endif
+#ifdef CONFIG_SOFT_WATCHDOG
+	watchdog_init();
 #endif
 #ifdef CONFIG_APM
 	apm_bios_init();
diff -u --recursive --new-file linux-2.0.39/drivers/char/vga.c linux-2.0.40/drivers/char/vga.c
--- linux-2.0.39/drivers/char/vga.c	Tue May  7 06:50:53 1996
+++ linux-2.0.40/drivers/char/vga.c	Thu Aug 23 18:49:46 2001
@@ -271,7 +271,7 @@
 	    /* Make sure that the hardware is not blanked */
 	    outb_p(HGA_BLINKER_ON | HGA_SCREEN_ON, 0x3b8);
 	  }
-#endif CONFIG_HGA
+#endif /* CONFIG_HGA */
 
 	if (video_mem_term - video_mem_base < offset + video_screen_size)
 	  offset = 0;	/* strange ... */
diff -u --recursive --new-file linux-2.0.39/drivers/isdn/hisax/elsa_ser.c linux-2.0.40/drivers/isdn/hisax/elsa_ser.c
--- linux-2.0.39/drivers/isdn/hisax/elsa_ser.c	Sun Nov 15 19:32:58 1998
+++ linux-2.0.40/drivers/isdn/hisax/elsa_ser.c	Thu Aug 23 18:56:11 2001
@@ -453,7 +453,7 @@
 			}
 		}
 	}
-#endif 0
+#endif /* 0 */
 }
 #endif
 
diff -u --recursive --new-file linux-2.0.39/drivers/isdn/icn/icn.c linux-2.0.40/drivers/isdn/icn/icn.c
--- linux-2.0.39/drivers/isdn/icn/icn.c	Sun Nov 15 19:32:59 1998
+++ linux-2.0.40/drivers/isdn/icn/icn.c	Mon Aug 20 13:36:28 2001
@@ -772,7 +772,7 @@
 	int left;
 	u_char c;
 	int ch;
-	int flags;
+	unsigned long flags;
 	int i;
 	u_char *p;
 	isdn_ctrl cmd;
diff -u --recursive --new-file linux-2.0.39/drivers/isdn/isdn_common.c linux-2.0.40/drivers/isdn/isdn_common.c
--- linux-2.0.39/drivers/isdn/isdn_common.c	Sun Nov 15 19:32:59 1998
+++ linux-2.0.40/drivers/isdn/isdn_common.c	Mon Aug 20 13:30:08 2001
@@ -391,7 +391,7 @@
 	}
 
 	if (tf) {
-		int flags;
+		unsigned long flags;
 
 		save_flags(flags);
 		cli();
@@ -405,7 +405,7 @@
 void
 isdn_timer_ctrl(int tf, int onoff)
 {
-	int flags;
+	unsigned long flags;
 
 	save_flags(flags);
 	cli();
@@ -2055,7 +2055,7 @@
 void
 cleanup_module(void)
 {
-	int flags;
+	unsigned long flags;
 	int i;
 
 #ifdef CONFIG_ISDN_PPP
diff -u --recursive --new-file linux-2.0.39/drivers/isdn/isdn_net.c linux-2.0.40/drivers/isdn/isdn_net.c
--- linux-2.0.39/drivers/isdn/isdn_net.c	Sun Jun 13 19:21:01 1999
+++ linux-2.0.40/drivers/isdn/isdn_net.c	Mon Aug 20 13:31:41 2001
@@ -777,7 +777,7 @@
 	isdn_net_dev *p = dev->netdev;
 	int anymore = 0;
 	int i;
-	int flags;
+	unsigned long flags;
 	isdn_ctrl cmd;
 
 	while (p) {
@@ -2521,7 +2521,7 @@
 			chidx = p->local.pre_channel;
 		}
 		if (cfg->exclusive > 0) {
-			int flags;
+			unsigned long flags;
 
 			/* If binding is exclusive, try to grab the channel */
 			save_flags(flags);
@@ -2733,7 +2733,7 @@
 	int more = 0;
 	int count = 0;
 	isdn_net_phone *n;
-	int flags;
+	unsigned long flags;
 	int ret;
 
 	if (!p)
@@ -2771,7 +2771,7 @@
 	int inout = phone->outgoing & 1;
 	isdn_net_phone *n;
 	isdn_net_phone *m;
-	int flags;
+	unsigned long flags;
 
 	if (p) {
 		save_flags(flags);
@@ -2807,7 +2807,7 @@
 {
 	isdn_net_phone *n;
 	isdn_net_phone *m;
-	int flags;
+	unsigned long flags;
 	int i;
 
 	save_flags(flags);
@@ -2856,7 +2856,7 @@
 static int
 isdn_net_realrm(isdn_net_dev * p, isdn_net_dev * q)
 {
-	int flags;
+	unsigned long flags;
 
 	save_flags(flags);
 	cli();
@@ -2942,7 +2942,7 @@
 int
 isdn_net_rmall(void)
 {
-	int flags;
+	unsigned long flags;
 	int ret;
 
 	/* Walk through netdev-chain */
diff -u --recursive --new-file linux-2.0.39/drivers/isdn/isdnloop/isdnloop.c linux-2.0.40/drivers/isdn/isdnloop/isdnloop.c
--- linux-2.0.39/drivers/isdn/isdnloop/isdnloop.c	Sun Nov 15 19:33:01 1998
+++ linux-2.0.40/drivers/isdn/isdnloop/isdnloop.c	Mon Aug 20 13:37:48 2001
@@ -318,7 +318,7 @@
 	int left;
 	u_char c;
 	int ch;
-	int flags;
+	unsigned long flags;
 	u_char *p;
 	isdn_ctrl cmd;
 
diff -u --recursive --new-file linux-2.0.39/drivers/net/atp.c linux-2.0.40/drivers/net/atp.c
--- linux-2.0.39/drivers/net/atp.c	Tue Aug 12 22:21:12 1997
+++ linux-2.0.40/drivers/net/atp.c	Mon Aug 20 13:39:49 2001
@@ -537,7 +537,7 @@
 	} else {
 		short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
 		unsigned char *buf = skb->data;
-		int flags;
+		unsigned long flags;
 
 		/* Disable interrupts by writing 0x00 to the Interrupt Mask Register.
 		   This sequence must not be interrupted by an incoming packet. */
diff -u --recursive --new-file linux-2.0.39/drivers/net/tulip.c linux-2.0.40/drivers/net/tulip.c
--- linux-2.0.39/drivers/net/tulip.c	Sun Jun 13 19:21:02 1999
+++ linux-2.0.40/drivers/net/tulip.c	Thu Aug 23 18:49:34 2001
@@ -296,7 +296,7 @@
 	0x125B, 0x1400, 0xffff, PCI_ADDR0_IO, 128, 32, tulip_probe1 },
   {0},
 };
-#endif CARD_BUS
+#endif /* CARD_BUS */
 
 /* This table use during operation for capabilities and media timer. */
 
diff -u --recursive --new-file linux-2.0.39/drivers/sbus/char/sunserial.c linux-2.0.40/drivers/sbus/char/sunserial.c
--- linux-2.0.39/drivers/sbus/char/sunserial.c	Mon May  6 11:26:09 1996
+++ linux-2.0.40/drivers/sbus/char/sunserial.c	Mon Aug 20 13:43:45 2001
@@ -904,7 +904,8 @@
 void kbd_put_char(unsigned char ch)
 {
 	struct sun_zschannel *chan = zs_kbdchan;
-	int flags, loops = 0;
+	int loops = 0;
+	unsigned long flags;
 
 	if(!chan)
 		return;
@@ -923,7 +924,8 @@
 void mouse_put_char(char ch)
 {
 	struct sun_zschannel *chan = zs_mousechan;
-	int flags, loops = 0;
+	int loops = 0;
+	unsigned long flags;
 
 	if(!chan)
 		return;
@@ -944,7 +946,8 @@
 static void rs_put_char(char ch)
 {
 	struct sun_zschannel *chan = zs_conschan;
-	int flags, loops = 0;
+	int loops = 0;
+	unsigned long flags;
 
 	if(!chan)
 		return;
@@ -1900,8 +1903,9 @@
 /* rs_init inits the driver */
 int rs_init(void)
 {
-	int chip, channel, i, flags;
+	int chip, channel, i;
 	struct sun_serial *info;
+	unsigned long flags;
 
 #if CONFIG_AP1000
         printk("not doing rs_init()\n");
@@ -1917,7 +1921,7 @@
 
 	/* Initialize the tty_driver structure */
 	/* SPARC: Not all of this is exactly right for us. */
-	
+
 	memset(&serial_driver, 0, sizeof(struct tty_driver));
 	serial_driver.magic = TTY_DRIVER_MAGIC;
 	serial_driver.name = "ttyS";
diff -u --recursive --new-file linux-2.0.39/drivers/scsi/NCR5380.h linux-2.0.40/drivers/scsi/NCR5380.h
--- linux-2.0.39/drivers/scsi/NCR5380.h	Thu Jun  4 00:17:48 1998
+++ linux-2.0.40/drivers/scsi/NCR5380.h	Thu Aug 23 18:49:54 2001
@@ -368,6 +368,6 @@
 }
 #endif /* defined(i386) || defined(__alpha__) */
 #endif /* defined(REAL_DMA)  */
-#endif __KERNEL_
+#endif /* __KERNEL_ */
 #endif /* ndef ASM */
 #endif /* NCR5380_H */
diff -u --recursive --new-file linux-2.0.39/drivers/scsi/NCR53c406a.c linux-2.0.40/drivers/scsi/NCR53c406a.c
--- linux-2.0.39/drivers/scsi/NCR53c406a.c	Mon Jul 13 22:47:32 1998
+++ linux-2.0.40/drivers/scsi/NCR53c406a.c	Thu Aug 23 18:52:42 2001
@@ -222,8 +222,8 @@
     (void *)0xc8000
 };
 #define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned ))
-#endif USE_BIOS
-		       
+#endif /* USE_BIOS */
+
 /* possible i/o port addresses */
 static unsigned short ports[] = { 0x230, 0x330 };
 #define PORT_COUNT (sizeof( ports ) / sizeof( unsigned short ))
@@ -244,7 +244,7 @@
     { "Copyright (C) Acculogic, Inc.\r\n2.8M Diskette Extension Bios ver 4.04.03 03/01/1993", 61, 82 },
 };
 #define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))
-#endif USE_BIOS
+#endif /* USE_BIOS */
 
 /* ============================================================ */
 
@@ -345,10 +345,10 @@
     clear_dma_ff(dma_chan);
     tmp = get_dma_residue(dma_chan);
     restore_flags(flags);
-    
+
     return tmp;
 }
-#endif USE_DMA
+#endif /* USE_DMA */
 
 #if USE_PIO
 static __inline__ int NCR53c406a_pio_read(unsigned char *request, 
@@ -357,14 +357,14 @@
     int	i;
     int	len;	/* current scsi fifo size */
     unsigned long flags = 0;
-    
+
     REG1;
     while (reqlen) {
         i = inb(PIO_STATUS);
         /*    VDEB(printk("pio_status=%x\n", i)); */
         if (i & 0x80) 
             return 0;
-        
+
         switch( i & 0x1e ) {
         default:
         case 0x10:
@@ -456,15 +456,15 @@
     }
     return 0;
 }
-#endif USE_PIO
+#endif /* USE_PIO */
 
-int 
+int
 NCR53c406a_detect(Scsi_Host_Template * tpnt){
     struct Scsi_Host *shpnt;
 #ifndef PORT_BASE
     int i;
 #endif
-    
+
 #if USE_BIOS
     int ii, jj;
     bios_base = 0;
@@ -475,15 +475,15 @@
                        (void *) signatures[jj].signature,
                        (int) signatures[jj].sig_length))
                 bios_base=addresses[ii];
-    
+
     if(!bios_base){
         printk("NCR53c406a: BIOS signature not found\n");
         return 0;
     }
-    
+
     DEB(printk("NCR53c406a BIOS found at %X\n", (unsigned int) bios_base););
-#endif USE_BIOS
-    
+#endif /* USE_BIOS */
+
 #ifdef PORT_BASE
     if (check_region(port_base, 0x10)) /* ports already snatched */
         port_base = 0;
@@ -511,18 +511,18 @@
             }
         }
     }
-#endif PORT_BASE
-    
+#endif /* PORT_BASE */
+
     if(!port_base){		/* no ports found */
         printk("NCR53c406a: no available ports found\n");
         return 0;
     }
-    
+
     DEB(printk("NCR53c406a detected\n"));
-    
+
     calc_port_addr();
     chip_init();
-    
+
 #ifndef IRQ_LEV
     if (irq_level < 0) {		/* LILO override if >= 0*/
         irq_level=irq_probe();
@@ -532,10 +532,10 @@
         }
     }
 #endif
-    
+
     DEB(printk("NCR53c406a: using port_base %x\n", port_base));
     request_region(port_base, 0x10, "NCR53c406a");
-    
+
     if(irq_level > 0) {
         if(request_irq(irq_level, NCR53c406a_intr, 0, "NCR53c406a", NULL)){
             printk("NCR53c406a: unable to allocate IRQ %d\n", irq_level);
@@ -550,26 +550,26 @@
 #if USE_DMA
         printk("NCR53c406a: No interrupts found and DMA mode defined. Giving up.\n");
         return 0;
-#endif USE_DMA
+#endif /* USE_DMA */
     }
     else {
         DEB(printk("NCR53c406a: Shouldn't get here!\n"));
         return 0;
     }
-    
+
 #if USE_DMA
     dma_chan = DMA_CHAN;
     if(request_dma(dma_chan, "NCR53c406a") != 0){
         printk("NCR53c406a: unable to allocate DMA channel %d\n", dma_chan);
         return 0;
     }
-    
+
     DEB(printk("Allocated DMA channel %d\n", dma_chan));
-#endif USE_DMA 
-    
+#endif /* USE_DMA */
+
     tpnt->present = 1;
     tpnt->proc_dir = &proc_scsi_NCR53c406a;
-    
+
     shpnt = scsi_register(tpnt, 0);
     shpnt->irq = irq_level;
     shpnt->io_port = port_base;
@@ -796,9 +796,9 @@
     printk("\n");
 #else
     printk(", pio=%02x\n", pio_status);
-#endif USE_DMA
-#endif NCR53C406A_DEBUG
-    
+#endif /* USE_DMA */
+#endif /* NCR53C406A_DEBUG */
+
     if(int_reg & 0x80){         /* SCSI reset intr */
         rtrc(3);
         DEB(printk("NCR53c406a: reset intr received\n"));
@@ -807,7 +807,7 @@
         current_SC->scsi_done(current_SC);
         return;
     }
-    
+
 #if USE_PIO
     if(pio_status & 0x80) {
         printk("NCR53C406A: Warning: PIO error!\n");
@@ -816,8 +816,8 @@
         current_SC->scsi_done(current_SC);
         return;
     }
-#endif USE_PIO
-    
+#endif /* USE_PIO */
+
     if(status & 0x20) {		/* Parity error */
         printk("NCR53c406a: Warning: parity error!\n");
         current_SC->SCp.phase = idle;
@@ -861,7 +861,7 @@
 #if USE_DMA			/* No s/g support for DMA */
             NCR53c406a_dma_write(current_SC->request_buffer, 
                                  current_SC->request_bufflen);
-#endif USE_DMA
+#endif /* USE_DMA */
             outb(TRANSFER_INFO | DMA_OP, CMD_REG); 
 #if USE_PIO
             if (!current_SC->use_sg) /* Don't use scatter-gather */
@@ -876,10 +876,10 @@
                 }
             }
             REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
         }
         break;
-        
+
     case 0x01:			/* DATA-IN */
         if(int_reg & 0x10){     /* Target requesting info transfer */
             rtrc(6);
@@ -890,7 +890,7 @@
 #if USE_DMA			/* No s/g support for DMA */
             NCR53c406a_dma_read(current_SC->request_buffer, 
                                 current_SC->request_bufflen);
-#endif USE_DMA
+#endif /* USE_DMA */
             outb(TRANSFER_INFO | DMA_OP, CMD_REG); 
 #if USE_PIO
             if (!current_SC->use_sg) /* Don't use scatter-gather */
@@ -905,10 +905,10 @@
                 }
             }
             REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
         }
         break;
-        
+
     case 0x02:			/* COMMAND */
         current_SC->SCp.phase = command_ph;
         printk("NCR53c406a: Warning: Unknown interrupt occurred in command phase!\n");
@@ -978,17 +978,17 @@
         probe_irq_off(irqs);
         return -1;
     }
-    
+
     irq = probe_irq_off(irqs);
-    
+
     /* Kick the chip */
     outb(CHIP_RESET, CMD_REG);
     outb(SCSI_NOP, CMD_REG);
     chip_init();
-    
+
     return irq;
 }
-#endif IRQ_LEV
+#endif /* IRQ_LEV */
 
 static void chip_init()
 {
@@ -999,12 +999,12 @@
     outb(0x01, PIO_STATUS);
 #endif
     outb(0x00, PIO_FLAG);
-    
+
     outb(C4_IMG, CONFIG4);	/* REG0; */
     outb(C3_IMG, CONFIG3);
     outb(C2_IMG, CONFIG2);
     outb(C1_IMG, CONFIG1);
-    
+
     outb(0x05, CLKCONV);        /* clock conversion factor */
     outb(0x9C, SRTIMOUT);       /* Selection timeout */
     outb(0x05, SYNCPRD);        /* Synchronous transfer period */
diff -u --recursive --new-file linux-2.0.39/drivers/scsi/aha152x.c linux-2.0.40/drivers/scsi/aha152x.c
--- linux-2.0.39/drivers/scsi/aha152x.c	Sun Nov 15 19:33:07 1998
+++ linux-2.0.40/drivers/scsi/aha152x.c	Mon Aug 20 14:00:37 2001
@@ -1536,7 +1536,7 @@
 void aha152x_intr(int irqno, void *dev_id, struct pt_regs * regs)
 {
   struct Scsi_Host *shpnt = aha152x_host[irqno-IRQ_MIN];
-  unsigned int flags;
+  unsigned long flags;
   int done=0, phase;
 
 #if defined(DEBUG_RACE)
diff -u --recursive --new-file linux-2.0.39/drivers/scsi/aha1542.c linux-2.0.40/drivers/scsi/aha1542.c
--- linux-2.0.39/drivers/scsi/aha1542.c	Sun Jun 13 19:21:02 1999
+++ linux-2.0.40/drivers/scsi/aha1542.c	Mon Aug 20 14:01:35 2001
@@ -356,7 +356,7 @@
     void (*my_done)(Scsi_Cmnd *) = NULL;
     int errstatus, mbi, mbo, mbistatus;
     int number_serviced;
-    unsigned int flags;
+    unsigned long flags;
     struct Scsi_Host * shost;
     Scsi_Cmnd * SCtmp;
     int flag;
diff -u --recursive --new-file linux-2.0.39/drivers/scsi/aic7xxx.c linux-2.0.40/drivers/scsi/aic7xxx.c
--- linux-2.0.39/drivers/scsi/aic7xxx.c	Sun Jun 13 19:21:02 1999
+++ linux-2.0.40/drivers/scsi/aic7xxx.c	Thu Aug 23 18:50:05 2001
@@ -9455,7 +9455,7 @@
       } /* while(pdev=....) */
     } /* for PCI_DEVICES */
   } /* PCI BIOS present */
-#endif CONFIG_PCI
+#endif /* CONFIG_PCI */
   /*
    * Now, we re-order the probed devices by BIOS address and BUS class.
    * In general, we follow this algorithm to make the adapters show up
diff -u --recursive --new-file linux-2.0.39/drivers/scsi/ultrastor.c linux-2.0.40/drivers/scsi/ultrastor.c
--- linux-2.0.39/drivers/scsi/ultrastor.c	Wed Aug 13 05:27:06 1997
+++ linux-2.0.40/drivers/scsi/ultrastor.c	Mon Aug 20 14:06:03 2001
@@ -333,7 +333,7 @@
 {
   static char fmt[80] = "abort %d (%x); MSCP free pool: %x;";
   register int i;
-  int flags;
+  unsigned long flags;
   save_flags(flags);
   cli();
 
@@ -681,7 +681,7 @@
     int mscp_index;
 #endif
     unsigned int status;
-    int flags;
+    unsigned long flags;
 
     /* Next test is for debugging; "can't happen" */
     if ((config.mscp_free & ((1U << ULTRASTOR_MAX_CMDS) - 1)) == 0)
@@ -853,7 +853,7 @@
       {
 	int port0 = (config.slot << 12) | 0xc80;
 	int i;
-	int flags;
+	unsigned long flags;
 	save_flags(flags);
 	cli();
 	strcpy(out, "OGM %d:%x ICM %d:%x ports:  ");
@@ -879,7 +879,7 @@
     if (config.slot ? inb(config.icm_address - 1) == 2 :
 	(inb(SYS_DOORBELL_INTR(config.doorbell_address)) & 1))
       {
-	int flags;
+	unsigned long flags;
 	save_flags(flags);
 	printk("Ux4F: abort while completed command pending\n");
 	restore_flags(flags);
@@ -901,7 +901,7 @@
        and the interrupt handler will call done.  */
     if (config.slot && inb(config.ogm_address - 1) == 0)
       {
-	int flags;
+	unsigned long flags;
 
 	save_flags(flags);
 	cli();
@@ -953,7 +953,7 @@
 
 int ultrastor_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags)
 {
-    int flags;
+    unsigned long flags;
     register int i;
 #if (ULTRASTOR_DEBUG & UD_RESET)
     printk("US14F: reset: called\n");
diff -u --recursive --new-file linux-2.0.39/drivers/sound/gus_wave.c linux-2.0.40/drivers/sound/gus_wave.c
--- linux-2.0.39/drivers/sound/gus_wave.c	Wed Aug 21 08:18:09 1996
+++ linux-2.0.40/drivers/sound/gus_wave.c	Mon Aug 20 16:55:55 2001
@@ -545,7 +545,7 @@
 {
   unsigned        vol, prev_vol, phase;
   unsigned char   rate;
-  long int        flags;
+  unsigned long  flags;
 
   if (voices[voice].mode & WAVE_SUSTAIN_ON && voices[voice].env_phase == 2)
     {
@@ -618,7 +618,7 @@
 }
 
 static void
-start_release (int voice, long int flags)
+start_release (int voice, unsigned long flags)
 {
   if (gus_read8 (0x00) & 0x03)
     return;			/* Voice already stopped */
@@ -639,7 +639,7 @@
 gus_voice_fade (int voice)
 {
   int             instr_no = sample_map[voice], is16bits;
-  long int        flags;
+  unsigned long   flags;
 
   save_flags (flags);
   cli ();
@@ -1581,7 +1581,7 @@
 static int
 guswave_start_note (int dev, int voice, int note_num, int volume)
 {
-  long int        flags;
+  unsigned long   flags;
   int             mode;
   int             ret_val = 0;
 
diff -u --recursive --new-file linux-2.0.39/fs/buffer.c linux-2.0.40/fs/buffer.c
--- linux-2.0.39/fs/buffer.c	Sun Nov 15 19:33:11 1998
+++ linux-2.0.40/fs/buffer.c	Wed Sep 12 15:29:46 2001
@@ -99,7 +99,7 @@
 
 /* These are the min and max parameter values that we will allow to be assigned */
 int bdflush_min[N_PARAM] = {  0,  10,    5,   25,  0,   100,   100, 1, 1};
-int bdflush_max[N_PARAM] = {100,5000, 2000, 2000,100, 60000, 60000, 2047, 5};
+int bdflush_max[N_PARAM] = {100, 5000, 2000, 2000, 100, 60000, 60000, 2047, 5};
 
 /*
  * Rewrote the wait-routines to use the "new" wait-queue functionality,
@@ -266,7 +266,7 @@
 		return -EBADF;
 	if (!file->f_op || !file->f_op->fsync)
 		return -EINVAL;
-	if (file->f_op->fsync(inode,file))
+	if (file->f_op->fsync(inode, file))
 		return -EIO;
 	return 0;
 }
@@ -281,7 +281,7 @@
 	if (!file->f_op || !file->f_op->fsync)
 		return -EINVAL;
 	/* this needs further work, at the moment it is identical to fsync() */
-	if (file->f_op->fsync(inode,file))
+	if (file->f_op->fsync(inode, file))
 		return -EIO;
 	return 0;
 }
@@ -311,8 +311,8 @@
 	}
 }
 
-#define _hashfn(dev,block) (((unsigned)(HASHDEV(dev)^block))&HASH_MASK)
-#define hash(dev,block) hash_table[_hashfn(dev,block)]
+#define _hashfn(dev, block) (((unsigned)(HASHDEV(dev)^block))&HASH_MASK)
+#define hash(dev, block) hash_table[_hashfn(dev, block)]
 
 static inline void remove_from_hash_queue(struct buffer_head * bh)
 {
@@ -320,8 +320,8 @@
 		bh->b_next->b_prev = bh->b_prev;
 	if (bh->b_prev)
 		bh->b_prev->b_next = bh->b_next;
-	if (hash(bh->b_dev,bh->b_blocknr) == bh)
-		hash(bh->b_dev,bh->b_blocknr) = bh->b_next;
+	if (hash(bh->b_dev, bh->b_blocknr) == bh)
+		hash(bh->b_dev, bh->b_blocknr) = bh->b_next;
 	bh->b_next = bh->b_prev = NULL;
 }
 
@@ -440,17 +440,17 @@
 	bh->b_next = NULL;
 	if (!(bh->b_dev))
 		return;
-	bh->b_next = hash(bh->b_dev,bh->b_blocknr);
-	hash(bh->b_dev,bh->b_blocknr) = bh;
+	bh->b_next = hash(bh->b_dev, bh->b_blocknr);
+	hash(bh->b_dev, bh->b_blocknr) = bh;
 	if (bh->b_next)
 		bh->b_next->b_prev = bh;
 }
 
 static inline struct buffer_head * find_buffer(kdev_t dev, int block, int size)
-{		
+{
 	struct buffer_head * tmp;
 
-	for (tmp = hash(dev,block) ; tmp != NULL ; tmp = tmp->b_next)
+	for (tmp = hash(dev, block) ; tmp != NULL ; tmp = tmp->b_next)
 		if (tmp->b_blocknr == block && tmp->b_dev == dev)
 			if (tmp->b_size == size)
 				return tmp;
@@ -479,7 +479,7 @@
 	struct buffer_head * bh;
 
 	for (;;) {
-		if (!(bh=find_buffer(dev,block,size)))
+		if (!(bh=find_buffer(dev, block, size)))
 			return NULL;
 		bh->b_count++;
 		wait_on_buffer(bh);
@@ -568,26 +568,26 @@
 
 	if (!bh)
 		goto no_candidate;
-	
+
 	for (; (*list_len) > 0; bh = bh->b_next_free, (*list_len)--) {
 		if (size != bh->b_size) {
 			/* this provides a mechanism for freeing blocks
 			   of other sizes, this is necessary now that we
 			   no longer have the lav code. */
-			try_to_free_buffer(bh,&bh,1);
+			try_to_free_buffer(bh, &bh, 1);
 			if (!bh)
 				break;
 			lookahead = 7;
 			continue;
 		}
-		else if (buffer_locked(bh) && 
+		else if (buffer_locked(bh) &&
 			 (bh->b_list == BUF_LOCKED || bh->b_list == BUF_LOCKED1)) {
 			if (!--lookahead) {
 				(*list_len) = 0;
 				goto no_candidate;
 			}
 		}
-		else if (can_reclaim(bh,size))
+		else if (can_reclaim(bh, size))
 			return bh;
 	}
 
@@ -602,7 +602,7 @@
 		kfree(bh);
 		return;
 	}
-	memset(bh,0,sizeof(*bh));
+	memset(bh, 0, sizeof(*bh));
 	nr_unused_buffer_heads++;
 	bh->b_next_free = unused_list;
 	unused_list = bh;
@@ -707,15 +707,15 @@
 			needed -= bh->b_size;
 			buffers[i]--;
 			if(buffers[i] == 0) candidate[i] = NULL;
-		
-			if (candidate[i] && !can_reclaim(candidate[i],size))
-				candidate[i] = find_candidate(candidate[i],&buffers[i], size);
+
+			if (candidate[i] && !can_reclaim(candidate[i], size))
+				candidate[i] = find_candidate(candidate[i], &buffers[i], size);
 		}
 		goto repeat;
 	}
 
 	/* Too bad, that was not enough. Try a little harder to grow some. */
-	
+
 	if (nr_free_pages > limit) {
 		if (grow_buffers(GFP_BUFFER, size)) {
 			needed -= PAGE_SIZE;
@@ -806,7 +806,7 @@
 refill:
 	allow_interrupts();
 	refill_freelist(size);
-	if (!find_buffer(dev,block,size))
+	if (!find_buffer(dev, block, size))
 		goto get_free;
 	goto repeat;
 }
@@ -946,29 +946,29 @@
 	if (pos >= filesize)
 		return NULL;
 
-	if (block < 0 || !(bh = getblk(dev,block,bufsize)))
+	if (block < 0 || !(bh = getblk(dev, block, bufsize)))
 		return NULL;
 
 	index = BUFSIZE_INDEX(bh->b_size);
 
 	if (buffer_uptodate(bh))
-		return(bh);   
+		return(bh);
 	else ll_rw_block(READ, 1, &bh);
 
 	blocks = (filesize - pos) >> (9+index);
 
 	if (blocks < (read_ahead[MAJOR(dev)] >> index))
 		blocks = read_ahead[MAJOR(dev)] >> index;
-	if (blocks > NBUF) 
+	if (blocks > NBUF)
 		blocks = NBUF;
 
-/*	if (blocks) printk("breada (new) %d blocks\n",blocks); */
+/*	if (blocks) printk("breada (new) %d blocks\n", blocks); */
 
 
 	bhlist[0] = bh;
 	j = 1;
 	for(i=1; i<blocks; i++) {
-		bh = getblk(dev,block+i,bufsize);
+		bh = getblk(dev, block+i, bufsize);
 		if (buffer_uptodate(bh)) {
 			brelse(bh);
 			break;
@@ -1020,7 +1020,7 @@
 		/* we now use kmalloc() here instead of gfp as we want
                    to be able to easily release buffer heads - they
                    took up quite a bit of memory (tridge) */
-		bh = (struct buffer_head *) kmalloc(sizeof(*bh),GFP_IO);
+		bh = (struct buffer_head *) kmalloc(sizeof(*bh), GFP_IO);
 		if (bh) {
 			put_unused_buffer_head(bh);
 			nr_buffer_heads++;
@@ -1373,7 +1373,7 @@
 	int isize;
 
 	if ((size & 511) || (size > PAGE_SIZE)) {
-		printk("VFS: grow_buffers: size = %d\n",size);
+		printk("VFS: grow_buffers: size = %d\n", size);
 		return 0;
 	}
 
@@ -1477,9 +1477,9 @@
 	int nlist;
 	static char *buf_types[NR_LIST] = {"CLEAN","LOCKED","LOCKED1","DIRTY"};
 
-	printk("Buffer memory:   %6dkB\n",buffermem>>10);
-	printk("Buffer heads:    %6d\n",nr_buffer_heads);
-	printk("Buffer blocks:   %6d\n",nr_buffers);
+	printk("Buffer memory:   %6dkB\n", buffermem>>10);
+	printk("Buffer heads:    %6d\n", nr_buffer_heads);
+	printk("Buffer blocks:   %6d\n", nr_buffers);
 
 	for(nlist = 0; nlist < NR_LIST; nlist++) {
 	  found = locked = dirty = used = lastused = protected = 0;
@@ -1515,7 +1515,7 @@
 	hash_table = (struct buffer_head **)vmalloc(NR_HASH*sizeof(struct buffer_head *));
 	if (!hash_table)
 		panic("Failed to allocate buffer hash table\n");
-	memset(hash_table,0,NR_HASH*sizeof(struct buffer_head *));
+	memset(hash_table, 0, NR_HASH*sizeof(struct buffer_head *));
 
 	lru_list[BUF_CLEAN] = 0;
 	grow_buffers(GFP_KERNEL, BLOCK_SIZE);
@@ -1577,7 +1577,7 @@
 		allow_interrupts();
 
 		bh = lru_list[nlist];
-		if(bh) 
+		if (bh)
 			 for (i = nr_buffers_type[nlist]; i-- > 0; bh = next) {
 				 /* We may have stalled while waiting for I/O to complete. */
 				 if(bh->b_list != nlist) goto repeat;
@@ -1681,7 +1681,7 @@
 	/*
 	 *	We have a bare-bones task_struct, and really should fill
 	 *	in a few more things so "top" and /proc/2/{exe,root,cwd}
-	 *	display semi-sane things. Not real crucial though...  
+	 *	display semi-sane things. Not real crucial though...
 	 */
 
 	current->session = 1;
@@ -1748,15 +1748,14 @@
 					  ndirty++;
 					  bh->b_flushtime = 0;
 					  if (major == LOOP_MAJOR) {
-						  ll_rw_block(wrta_cmd,1, &bh);
+						  ll_rw_block(wrta_cmd, 1, &bh);
 						  wrta_cmd = WRITEA;
 						  if (buffer_dirty(bh))
 							  --ndirty;
-					  }
-					  else
-					  ll_rw_block(WRITE, 1, &bh);
+					  } else
+						  ll_rw_block(WRITE, 1, &bh);
 #ifdef DEBUG
-					  if(nlist != BUF_DIRTY) ncount++;
+					  if (nlist != BUF_DIRTY) ncount++;
 #endif
 					  bh->b_count--;
 					  next->b_count--;
diff -u --recursive --new-file linux-2.0.39/fs/exec.c linux-2.0.40/fs/exec.c
--- linux-2.0.39/fs/exec.c	Tue Apr 25 16:16:37 2000
+++ linux-2.0.40/fs/exec.c	Sat Mar  3 16:45:30 2001
@@ -497,8 +497,9 @@
 	int ch;
 	char * name;
 
+	bprm->dumpable = 0;
 	if (current->euid == current->uid && current->egid == current->gid)
-		current->dumpable = 1;
+		bprm->dumpable = 1;
 	name = bprm->filename;
 	for (i=0; (ch = *(name++)) != '\0';) {
 		if (ch == '/')
@@ -515,9 +516,9 @@
 
 	flush_thread();
 
-	if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || 
-	    permission(bprm->inode,MAY_READ))
-		current->dumpable = 0;
+	if (bprm->e_uid != current->euid || bprm->e_gid != current->egid ||
+	    permission(bprm->inode, MAY_READ))
+		bprm->dumpable = 0;
 
 	flush_old_signals(current->sig);
 	flush_old_files(current->files);
@@ -707,6 +708,7 @@
 int do_execve(char * filename, char ** argv, char ** envp, struct pt_regs * regs)
 {
 	struct linux_binprm bprm;
+	int was_dumpable;
 	int retval;
 	int i;
 
@@ -726,6 +728,9 @@
 	if ((bprm.envc = count(envp, sizeof(char *), bprm.p)) < 0)
 		return bprm.envc;
 
+	was_dumpable = current->dumpable;
+	current->dumpable = 0;
+
 	retval = prepare_binprm(&bprm);
 	
 	if(retval>=0) {
@@ -739,14 +744,20 @@
 
 	if(retval>=0)
 		retval = search_binary_handler(&bprm,regs);
-	if(retval>=0)
+
+	if(retval>=0) {
 		/* execve success */
+		current->dumpable = bprm.dumpable;
 		return retval;
+	}
 
 	/* Something went wrong, return the inode and free the argument pages*/
 	if(!bprm.dont_iput)
 		iput(bprm.inode);
 	for (i=0 ; i<MAX_ARG_PAGES ; i++)
 		free_page(bprm.page[i]);
+
+	current->dumpable = was_dumpable;
+
 	return(retval);
 }
diff -u --recursive --new-file linux-2.0.39/fs/ext2/truncate.c linux-2.0.40/fs/ext2/truncate.c
--- linux-2.0.39/fs/ext2/truncate.c	Mon Dec 11 05:56:35 1995
+++ linux-2.0.40/fs/ext2/truncate.c	Tue Aug 21 11:24:22 2001
@@ -93,9 +93,9 @@
 		if (free_count == 0) {
 			block_to_free = tmp;
 			free_count++;
-		} else if (free_count > 0 && block_to_free == tmp - free_count)
+		} else if (free_count > 0 && block_to_free == tmp - free_count) {
 			free_count++;
-		else {
+		} else {
 			ext2_free_blocks (inode, block_to_free, free_count);
 			block_to_free = tmp;
 			free_count = 1;
@@ -160,9 +160,9 @@
 		if (free_count == 0) {
 			block_to_free = tmp;
 			free_count++;
-		} else if (free_count > 0 && block_to_free == tmp - free_count)
+		} else if (free_count > 0 && block_to_free == tmp - free_count) {
 			free_count++;
-		else {
+		} else {
 			ext2_free_blocks (inode, block_to_free, free_count);
 			block_to_free = tmp;
 			free_count = 1;
@@ -177,16 +177,17 @@
 	for (i = 0; i < addr_per_block; i++)
 		if (*(ind++))
 			break;
-	if (i >= addr_per_block)
-		if (ind_bh->b_count != 1)
+	if (i >= addr_per_block) {
+		if (ind_bh->b_count != 1) {
 			retry = 1;
-		else {
+		} else {
 			tmp = *p;
 			*p = 0;
 			inode->i_blocks -= blocks;
 			inode->i_dirt = 1;
 			ext2_free_blocks (inode, tmp, 1);
 		}
+	}
 	if (IS_SYNC(inode) && buffer_dirty(ind_bh)) {
 		ll_rw_block (WRITE, 1, &ind_bh);
 		wait_on_buffer (ind_bh);
@@ -238,9 +239,9 @@
 		if (*(dind++))
 			break;
 	if (i >= addr_per_block)
-		if (dind_bh->b_count != 1)
+		if (dind_bh->b_count != 1) {
 			retry = 1;
-		else {
+		} else {
 			tmp = *p;
 			*p = 0;
 			inode->i_blocks -= blocks;
@@ -296,16 +297,17 @@
 	for (i = 0; i < addr_per_block; i++)
 		if (*(tind++))
 			break;
-	if (i >= addr_per_block)
-		if (tind_bh->b_count != 1)
+	if (i >= addr_per_block) {
+		if (tind_bh->b_count != 1) {
 			retry = 1;
-		else {
+		} else {
 			tmp = *p;
 			*p = 0;
 			inode->i_blocks -= blocks;
 			inode->i_dirt = 1;
 			ext2_free_blocks (inode, tmp, 1);
 		}
+	}
 	if (IS_SYNC(inode) && buffer_dirty(tind_bh)) {
 		ll_rw_block (WRITE, 1, &tind_bh);
 		wait_on_buffer (tind_bh);
@@ -313,7 +315,7 @@
 	brelse (tind_bh);
 	return retry;
 }
-		
+
 void ext2_truncate (struct inode * inode)
 {
 	int retry;
diff -u --recursive --new-file linux-2.0.39/fs/isofs/inode.c linux-2.0.40/fs/isofs/inode.c
--- linux-2.0.39/fs/isofs/inode.c	Sun Jun 13 19:21:03 1999
+++ linux-2.0.40/fs/isofs/inode.c	Tue Aug 21 17:47:07 2001
@@ -241,18 +241,18 @@
 				       CDROMMULTISESSION,
 				       (unsigned long) &ms_info);
       set_fs(old_fs);
-#if 0 
+#if 0
       printk("isofs.inode: CDROMMULTISESSION: rc=%d\n",i);
       if (i==0)
 	{
 	  printk("isofs.inode: XA disk: %s\n", ms_info.xa_flag ? "yes":"no");
 	  printk("isofs.inode: vol_desc_start = %d\n", ms_info.addr.lba);
 	}
-#endif 0
+#endif /* 0 */
       if (i==0)
 #if WE_OBEY_THE_WRITTEN_STANDARDS
         if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
-#endif WE_OBEY_THE_WRITTEN_STANDARDS
+#endif /* WE_OBEY_THE_WRITTEN_STANDARDS */
           vol_desc_start=ms_info.addr.lba;
     }
   return vol_desc_start;
@@ -302,7 +302,7 @@
 	printk("gid = %d\n", opt.gid);
 	printk("uid = %d\n", opt.uid);
 #endif
-	
+
 	blocksize_bits = 0;
 	{
 	  int i = opt.blocksize;
@@ -318,7 +318,7 @@
 	s->u.isofs_sb.s_high_sierra = high_sierra = 0; /* default is iso9660 */
 
 	vol_desc_start = isofs_get_last_session(dev);
-	
+
 	for (iso_blknum = vol_desc_start+16;
              iso_blknum < vol_desc_start+100; iso_blknum++)
 	{
@@ -405,7 +405,7 @@
 	    printk("Multi-volume disks not supported.\n");
 	    goto out;
 	  }
-#endif IGNORE_WRONG_MULTI_VOLUME_SPECS
+#endif /* IGNORE_WRONG_MULTI_VOLUME_SPECS */
 	  s->u.isofs_sb.s_nzones = isonum_733 (h_pri->volume_space_size);
 	  s->u.isofs_sb.s_log_zone_size = isonum_723 (h_pri->logical_block_size);
 	  s->u.isofs_sb.s_max_size = isonum_733(h_pri->volume_space_size);
@@ -416,14 +416,14 @@
 	    printk("Multi-volume disks not supported.\n");
 	    goto out;
 	  }
-#endif IGNORE_WRONG_MULTI_VOLUME_SPECS
+#endif /* IGNORE_WRONG_MULTI_VOLUME_SPECS */
 	  s->u.isofs_sb.s_nzones = isonum_733 (pri->volume_space_size);
 	  s->u.isofs_sb.s_log_zone_size = isonum_723 (pri->logical_block_size);
 	  s->u.isofs_sb.s_max_size = isonum_733(pri->volume_space_size);
 	}
-	
+
 	s->u.isofs_sb.s_ninodes = 0; /* No way to figure this out easily */
-	
+
 	/* RDE: convert log zone size to bit shift */
 
 	orig_zonesize = s -> u.isofs_sb.s_log_zone_size;
@@ -438,16 +438,16 @@
 	  }
 
 	s->s_magic = ISOFS_SUPER_MAGIC;
-	
+
 	/* The CDROM is read-only, has no nodes (devices) on it, and since
 	   all of the files appear to be owned by root, we really do not want
 	   to allow suid.  (suid or devices will not show up unless we have
 	   Rock Ridge extensions) */
-	
+
 	s->s_flags |= MS_RDONLY /* | MS_NODEV | MS_NOSUID */;
-	
+
 	brelse(bh);
-	
+
 	/* RDE: data zone now byte offset! */
 
 	s->u.isofs_sb.s_firstdatazone = ((isonum_733 (rootp->extent) + 
@@ -564,7 +564,7 @@
 #else
 	check_disk_change(s->s_dev);
 	return s;
-#endif	
+#endif
 
  out: /* Kick out for various error conditions */
 	brelse(bh);
@@ -657,7 +657,7 @@
 #endif
 			nextino = ino->u.isofs_i.i_next_section_ino;
 			iput(ino);
-		
+
 			if(++i > MAX_FILE_SECTIONS) {
 				printk("isofs_bmap: More than %d file sections ?!?, aborting...\n",
 				       MAX_FILE_SECTIONS);
@@ -880,14 +880,14 @@
 	printk("Get inode %d: %d %d: %d\n",inode->i_ino, block, 
 	       ((int)pnt) & 0x3ff, inode->i_size);
 #endif
-	
+
 	inode->i_mtime = inode->i_atime = inode->i_ctime = 
 	  iso_date(raw_inode->date, high_sierra);
 
 	inode->u.isofs_i.i_first_extent = (isonum_733 (raw_inode->extent) + 
 					   isonum_711 (raw_inode->ext_attr_length))
 	  << inode -> i_sb -> u.isofs_sb.s_log_zone_size;
-	
+
 	inode->u.isofs_i.i_backlink = 0xffffffff; /* Will be used for previous directory */
 	switch (inode->i_sb->u.isofs_sb.s_conversion){
 	case 'a':
@@ -912,12 +912,12 @@
 	  /* hmm..if we want uid or gid set, override the rock ridge setting */
 	 test_and_set_uid(&inode->i_uid, inode->i_sb->u.isofs_sb.s_uid);
 	}
-	
+
 #ifdef DEBUG
 	printk("Inode: %x extent: %x\n",inode->i_ino, inode->u.isofs_i.i_first_extent);
 #endif
 	brelse(bh);
-	
+
 	inode->i_op = NULL;
 
 	/* get the volume sequence number */
@@ -940,7 +940,7 @@
 	    (volume_seq_no != 0) && (volume_seq_no != 1)) {
 		printk("Multi volume CD somehow got mounted.\n");
 	} else
-#endif IGNORE_WRONG_MULTI_VOLUME_SPECS
+#endif /* IGNORE_WRONG_MULTI_VOLUME_SPECS */
 	{
 	  if (S_ISREG(inode->i_mode))
 	    inode->i_op = &isofs_file_inode_operations;
diff -u --recursive --new-file linux-2.0.39/fs/pipe.c linux-2.0.40/fs/pipe.c
--- linux-2.0.39/fs/pipe.c	Sun Nov 15 19:33:14 1998
+++ linux-2.0.40/fs/pipe.c	Wed Aug 22 10:22:55 2001
@@ -35,11 +35,13 @@
 	if (filp->f_flags & O_NONBLOCK) {
 		if (PIPE_LOCK(*inode))
 			return -EAGAIN;
-		if (PIPE_EMPTY(*inode))
-			if (PIPE_WRITERS(*inode))
+		if (PIPE_EMPTY(*inode)) {
+			if (PIPE_WRITERS(*inode)) {
 				return -EAGAIN;
-			else
+			} else {
 				return 0;
+			}
+		}
 	} else while (PIPE_EMPTY(*inode) || PIPE_LOCK(*inode)) {
 		if (PIPE_EMPTY(*inode)) {
 			if (!PIPE_WRITERS(*inode))
diff -u --recursive --new-file linux-2.0.39/fs/proc/array.c linux-2.0.40/fs/proc/array.c
--- linux-2.0.39/fs/proc/array.c	Tue Apr 25 16:16:37 2000
+++ linux-2.0.40/fs/proc/array.c	Thu Aug 23 19:29:10 2001
@@ -14,7 +14,7 @@
  *                      EVERY character on the current page.
  *                      <middelin@polyware.iaf.nl>
  *
- * Danny ter Haar    :	added cpuinfo 
+ * Danny ter Haar    :	added cpuinfo
  *			<dth@cistron.nl>
  *
  * Alessandro Rubini :  profile extension.
diff -u --recursive --new-file linux-2.0.39/include/asm-i386/bugs.h linux-2.0.40/include/asm-i386/bugs.h
--- linux-2.0.39/include/asm-i386/bugs.h	Sun Jun 13 19:21:03 1999
+++ linux-2.0.40/include/asm-i386/bugs.h	Thu Aug 23 18:48:53 2001
@@ -228,8 +228,7 @@
 
                 if (d > 20*K6_BUG_LOOP) {
                         printk("system stability may be impaired when more than 32 MB are used.\n");
-		}
-                else 
+		} else
                         printk("probably OK (after B9730xxxx).\n");
         }
 }
@@ -346,7 +345,7 @@
 				int eax, dummy;
 
 				/* get processor info */
-			
+
 				cpuid(1, &eax, &dummy, &dummy,
 				      &x86_capability);
 
diff -u --recursive --new-file linux-2.0.39/include/asm-m68k/zorro.h linux-2.0.40/include/asm-m68k/zorro.h
--- linux-2.0.39/include/asm-m68k/zorro.h	Mon May 20 06:54:29 1996
+++ linux-2.0.40/include/asm-m68k/zorro.h	Thu Aug 23 18:49:08 2001
@@ -385,7 +385,7 @@
 #ifdef CONFIG_ZORRO
 extern void zorro_identify(void);
 extern int zorro_get_list(char *buffer);
-#endif CONFIG_ZORRO
+#endif /* CONFIG_ZORRO */
 
 #endif	/* __ASSEMBLY__ */
 
diff -u --recursive --new-file linux-2.0.39/include/asm-sparc/bitops.h linux-2.0.40/include/asm-sparc/bitops.h
--- linux-2.0.39/include/asm-sparc/bitops.h	Sun Apr 21 11:30:33 1996
+++ linux-2.0.40/include/asm-sparc/bitops.h	Mon Aug 20 14:14:52 2001
@@ -31,9 +31,10 @@
 
 extern __inline__ unsigned long set_bit(unsigned long nr, SMPVOL void *addr)
 {
-	int mask, flags;
+	int mask;
 	unsigned long *ADDR = (unsigned long *) addr;
 	unsigned long oldbit;
+	unsigned long flags;
 
 	ADDR += nr >> 5;
 	mask = 1 << (nr & 31);
@@ -46,9 +47,10 @@
 
 extern __inline__ unsigned long clear_bit(unsigned long nr, SMPVOL void *addr)
 {
-	int mask, flags;
+	int mask;
 	unsigned long *ADDR = (unsigned long *) addr;
 	unsigned long oldbit;
+	unsigned long flags;
 
 	ADDR += nr >> 5;
 	mask = 1 << (nr & 31);
@@ -61,9 +63,10 @@
 
 extern __inline__ unsigned long change_bit(unsigned long nr, SMPVOL void *addr)
 {
-	int mask, flags;
+	int mask;
 	unsigned long *ADDR = (unsigned long *) addr;
 	unsigned long oldbit;
+	unsigned long flags;
 
 	ADDR += nr >> 5;
 	mask = 1 << (nr & 31);
@@ -144,8 +147,9 @@
 
 extern __inline__ int ext2_set_bit(int nr,void * addr)
 {
-	int		mask, retval, flags;
+	int		mask, retval;
 	unsigned char	*ADDR = (unsigned char *) addr;
+	unsigned long	flags;
 
 	ADDR += nr >> 3;
 	mask = 1 << (nr & 0x07);
@@ -158,8 +162,9 @@
 
 extern __inline__ int ext2_clear_bit(int nr, void * addr)
 {
-	int		mask, retval, flags;
+	int		mask, retval;
 	unsigned char	*ADDR = (unsigned char *) addr;
+	unsigned long	flags;
 
 	ADDR += nr >> 3;
 	mask = 1 << (nr & 0x07);
diff -u --recursive --new-file linux-2.0.39/include/asm-sparc/head.h linux-2.0.40/include/asm-sparc/head.h
--- linux-2.0.39/include/asm-sparc/head.h	Mon May  6 11:26:16 1996
+++ linux-2.0.40/include/asm-sparc/head.h	Thu Aug 23 18:49:25 2001
@@ -99,4 +99,4 @@
 #define WINDOW_FILL \
         rd %psr, %l0; rd %wim, %l3; b fill_window_entry; andcc %l0, PSR_PS, %g0;
 
-#endif __SPARC_HEAD_H
+#endif /* __SPARC_HEAD_H */
diff -u --recursive --new-file linux-2.0.39/include/linux/binfmts.h linux-2.0.40/include/linux/binfmts.h
--- linux-2.0.39/include/linux/binfmts.h	Wed Oct 15 23:56:43 1997
+++ linux-2.0.40/include/linux/binfmts.h	Sat Mar  3 16:45:30 2001
@@ -24,6 +24,7 @@
 	char * filename;	/* Name of binary */
 	unsigned long loader, exec;
 	int dont_iput;		/* binfmt handler has put inode */
+	int dumpable;
 };
 
 /*
diff -u --recursive --new-file linux-2.0.39/include/linux/blk.h linux-2.0.40/include/linux/blk.h
--- linux-2.0.39/include/linux/blk.h	Sun Jun 13 19:21:04 1999
+++ linux-2.0.40/include/linux/blk.h	Wed Sep 12 15:37:34 2001
@@ -30,63 +30,63 @@
  */
 #if defined(IDE_DRIVER) || defined(MD_DRIVER)
 #define SECTOR_MASK ((BLOCK_SIZE >> 9) - 1)
-#else
+#else /* defined(IDE_DRIVER) || defined(MD_DRIVER) */
 #define SECTOR_MASK (blksize_size[MAJOR_NR] &&     \
 	blksize_size[MAJOR_NR][MINOR(CURRENT->rq_dev)] ? \
 	((blksize_size[MAJOR_NR][MINOR(CURRENT->rq_dev)] >> 9) - 1) :  \
 	((BLOCK_SIZE >> 9)  -  1))
-#endif /* IDE_DRIVER */
+#endif /* !(defined(IDE_DRIVER) || defined(MD_DRIVER)) */
 
 #define SUBSECTOR(block) (CURRENT->current_nr_sectors > 0)
 
 #ifdef CONFIG_CDU31A
 extern int cdu31a_init(void);
-#endif CONFIG_CDU31A
+#endif /* CONFIG_CDU31A */
 #ifdef CONFIG_MCD
 extern int mcd_init(void);
-#endif CONFIG_MCD
+#endif /* CONFIG_MCD */
 #ifdef CONFIG_MCDX
 extern int mcdx_init(void);
-#endif CONFIG_MCDX
+#endif /* CONFIG_MCDX */
 #ifdef CONFIG_SBPCD
 extern int sbpcd_init(void);
-#endif CONFIG_SBPCD
+#endif /* CONFIG_SBPCD */
 #ifdef CONFIG_AZTCD
 extern int aztcd_init(void);
-#endif CONFIG_AZTCD
+#endif /* CONFIG_AZTCD */
 #ifdef CONFIG_CDU535
 extern int sony535_init(void);
-#endif CONFIG_CDU535
+#endif /* CONFIG_CDU535 */
 #ifdef CONFIG_GSCD
 extern int gscd_init(void);
-#endif CONFIG_GSCD
+#endif /* CONFIG_GSCD */
 #ifdef CONFIG_CM206
 extern int cm206_init(void);
-#endif CONFIG_CM206
+#endif /* CONFIG_CM206 */
 #ifdef CONFIG_OPTCD
 extern int optcd_init(void);
-#endif CONFIG_OPTCD
+#endif /* CONFIG_OPTCD */
 #ifdef CONFIG_SJCD
 extern int sjcd_init(void);
-#endif CONFIG_SJCD
+#endif /* CONFIG_SJCD */
 #ifdef CONFIG_CDI_INIT
 extern int cdi_init(void);
-#endif CONFIG_CDI_INIT
+#endif /* CONFIG_CDI_INIT */
 #ifdef CONFIG_BLK_DEV_HD
 extern int hd_init(void);
-#endif
+#endif /* CONFIG_BLK_DEV_HD */
 #ifdef CONFIG_BLK_DEV_IDE
 extern int ide_init(void);
-#endif
+#endif /* CONFIG_BLK_DEV_IDE */
 #ifdef CONFIG_BLK_DEV_XD
 extern int xd_init(void);
-#endif
+#endif /* CONFIG_BLK_DEV_XD */
 #ifdef CONFIG_BLK_DEV_LOOP
 extern int loop_init(void);
-#endif
+#endif /* CONFIG_BLK_DEV_LOOP */
 #ifdef CONFIG_BLK_DEV_MD
 extern int md_init(void);
-#endif CONFIG_BLK_DEV_MD
+#endif /* CONFIG_BLK_DEV_MD */
 
 extern void set_device_ro(kdev_t dev,int flag);
 void add_blkdev_randomness(int major);
@@ -106,7 +106,7 @@
 extern int mount_initrd; /* zero if initrd should not be mounted */
 void initrd_init(void);
 
-#endif
+#endif /* CONFIG_BLK_DEV_INITRD */
 
 #define RO_IOCTLS(dev,where) \
   case BLKROSET: { int __err;  if (!suser()) return -EACCES; \
@@ -114,7 +114,7 @@
 		   if (!__err) set_device_ro((dev),get_fs_long((long *) (where))); return __err; } \
   case BLKROGET: { int __err = verify_area(VERIFY_WRITE, (void *) (where), sizeof(long)); \
 		   if (!__err) put_fs_long(0!=is_read_only(dev),(long *) (where)); return __err; }
-		 
+
 #if defined(MAJOR_NR) || defined(IDE_DRIVER)
 
 /*
@@ -133,7 +133,7 @@
 #define DEVICE_NAME "ramdisk"
 #define DEVICE_REQUEST rd_request
 #define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device) 
+#define DEVICE_ON(device)
 #define DEVICE_OFF(device)
 #define DEVICE_NO_RANDOM
 
@@ -163,7 +163,7 @@
 #elif (MAJOR_NR == SCSI_DISK_MAJOR)
 
 #define DEVICE_NAME "scsidisk"
-#define DEVICE_INTR do_sd  
+#define DEVICE_INTR do_sd
 #define TIMEOUT_VALUE (2*HZ)
 #define DEVICE_REQUEST do_sd_request
 #define DEVICE_NR(device) (MINOR(device) >> 4)
@@ -182,7 +182,7 @@
 #elif (MAJOR_NR == SCSI_TAPE_MAJOR)
 
 #define DEVICE_NAME "scsitape"
-#define DEVICE_INTR do_st  
+#define DEVICE_INTR do_st
 #define DEVICE_NR(device) (MINOR(device) & 0x7f)
 #define DEVICE_ON(device)
 #define DEVICE_OFF(device)
@@ -327,13 +327,13 @@
 
 #ifndef CURRENT
 #define CURRENT (blk_dev[MAJOR_NR].current_request)
-#endif
+#endif /* !CURRENT */
 
 #define CURRENT_DEV DEVICE_NR(CURRENT->rq_dev)
 
 #ifdef DEVICE_INTR
 static void (*DEVICE_INTR)(void) = NULL;
-#endif
+#endif /* DEVICE_INTR */
 #ifdef DEVICE_TIMEOUT
 
 #define SET_TIMER \
@@ -349,19 +349,19 @@
 else \
 	CLEAR_TIMER;
 
-#else
+#else /* DEVICE_TIMEOUT */
 
 #define SET_INTR(x) (DEVICE_INTR = (x))
 
-#endif /* DEVICE_TIMEOUT */
+#endif /* !DEVICE_TIMEOUT */
 
 static void (DEVICE_REQUEST)(void);
-  
+
 #ifdef DEVICE_INTR
 #define CLEAR_INTR SET_INTR(NULL)
-#else
+#else /* DEVICE_INTR */
 #define CLEAR_INTR
-#endif
+#endif /* !DEVICE_INTR */
 
 #define INIT_REQUEST \
 	if (!CURRENT) {\
@@ -380,19 +380,19 @@
 /* end_request() - SCSI devices have their own version */
 /*               - IDE drivers have their own copy too */
 
-#if ! SCSI_BLK_MAJOR(MAJOR_NR) && (MAJOR_NR != COMPAQ_SMART2_MAJOR)
+#if !SCSI_BLK_MAJOR(MAJOR_NR) && (MAJOR_NR != COMPAQ_SMART2_MAJOR)
 
 #if defined(IDE_DRIVER) && !defined(_IDE_C) /* shared copy for IDE modules */
 void ide_end_request(byte uptodate, ide_hwgroup_t *hwgroup);
-#else
+#else /* defined(IDE_DRIVER) && !defined(_IDE_C) */
 
 #ifdef IDE_DRIVER
 void ide_end_request(byte uptodate, ide_hwgroup_t *hwgroup) {
 	struct request *req = hwgroup->rq;
-#else
+#else /* IDE_DRIVER */
 static void end_request(int uptodate) {
 	struct request *req = CURRENT;
-#endif /* IDE_DRIVER */
+#endif /* !IDE_DRIVER */
 	struct buffer_head * bh;
 	int nsect;
 
@@ -412,24 +412,21 @@
 	if ((bh = req->bh) != NULL) {
 		req->bh = bh->b_reqnext;
 		bh->b_reqnext = NULL;
- 
- 		/*
- 		 * This is our 'MD IO has finished' event handler.
- 		 * note that b_state should be cached in a register
- 		 * anyways, so the overhead if this checking is almost 
- 		 * zero. But anyways .. we never get OO for free :)
- 		 */
- 		if (test_bit(BH_MD, &bh->b_state)) {
- 			struct md_personality * pers=(struct md_personality *)bh->personality;
- 			pers->end_request(bh,uptodate);
- 		}
- 		/*
- 		 * the normal (nonmirrored and no RAID5) case:
- 		 */
- 		else {
- 			mark_buffer_uptodate(bh, uptodate);
- 			unlock_buffer(bh);
- 		}
+
+		/* This is our 'MD IO has finished' event handler.
+		 * note that b_state should be cached in a register
+		 * anyways, so the overhead if this checking is almost
+		 * zero. But anyways .. we never get OO for free :)
+		 */
+		if (test_bit(BH_MD, &bh->b_state)) {
+			struct md_personality * pers=(struct md_personality *)bh->personality;
+			pers->end_request(bh,uptodate);
+		} else {
+			/* the normal (nonmirrored and no RAID5) case:
+			 */
+			mark_buffer_uptodate(bh, uptodate);
+			unlock_buffer(bh);
+		}
 		if ((bh = req->bh) != NULL) {
 			req->current_nr_sectors = bh->b_size >> 9;
 			if (req->nr_sectors < req->current_nr_sectors) {
@@ -442,21 +439,21 @@
 	}
 #ifndef DEVICE_NO_RANDOM
 	add_blkdev_randomness(MAJOR(req->rq_dev));
-#endif
+#endif /* !DEVICE_NO_RANDOM */
 #ifdef IDE_DRIVER
 	blk_dev[MAJOR(req->rq_dev)].current_request = req->next;
 	hwgroup->rq = NULL;
-#else
+#else /* IDE_DRIVER */
 	DEVICE_OFF(req->rq_dev);
 	CURRENT = req->next;
-#endif /* IDE_DRIVER */
+#endif /* !IDE_DRIVER */
 	if (req->sem != NULL)
 		up(req->sem);
 	req->rq_status = RQ_INACTIVE;
 	wake_up(&wait_for_request);
 }
-#endif /* defined(IDE_DRIVER) && !defined(_IDE_C) */
-#endif /* ! SCSI_BLK_MAJOR(MAJOR_NR) */
+#endif /* !(defined(IDE_DRIVER) && !defined(_IDE_C)) */
+#endif /* !SCSI_BLK_MAJOR(MAJOR_NR) */
 #endif /* (MAJOR_NR != SCSI_TAPE_MAJOR) */
 
 #endif /* defined(MAJOR_NR) || defined(IDE_DRIVER) */
diff -u --recursive --new-file linux-2.0.39/include/linux/cdrom.h linux-2.0.40/include/linux/cdrom.h
--- linux-2.0.39/include/linux/cdrom.h	Fri Sep 20 16:00:36 1996
+++ linux-2.0.40/include/linux/cdrom.h	Thu Aug 23 18:33:07 2001
@@ -67,14 +67,14 @@
  * CDROM IOCTL structures
  */
 
-struct cdrom_blk 
+struct cdrom_blk
 {
 	unsigned from;
 	unsigned short len;
 };
 
 
-struct cdrom_msf 
+struct cdrom_msf
 {
 	u_char	cdmsf_min0;	/* start minute */
 	u_char	cdmsf_sec0;	/* start second */
@@ -84,7 +84,7 @@
 	u_char	cdmsf_frame1;	/* end frame */
 };
 
-struct cdrom_ti 
+struct cdrom_ti
 {
 	u_char	cdti_trk0;	/* start track */
 	u_char	cdti_ind0;	/* start index */
@@ -92,7 +92,7 @@
 	u_char	cdti_ind1;	/* end index */
 };
 
-struct cdrom_tochdr 	
+struct cdrom_tochdr
 {
 	u_char	cdth_trk0;	/* start track */
 	u_char	cdth_trk1;	/* end track */
@@ -111,7 +111,7 @@
 	int			lba;
 };
 
-struct cdrom_tocentry 
+struct cdrom_tocentry
 {
 	u_char	cdte_track;
 	u_char	cdte_adr	:4;
@@ -137,7 +137,7 @@
  */
 #define	CDROM_LEADOUT	0xAA
 
-struct cdrom_subchnl 
+struct cdrom_subchnl
 {
 	u_char	cdsc_format;
 	u_char	cdsc_audiostatus;
@@ -204,9 +204,9 @@
 
 #ifdef FIVETWELVE
 #define	CDROM_MODE1_SIZE	512
-#else
+#else /* FIVETWELVE */
 #define	CDROM_MODE1_SIZE	2048
-#endif FIVETWELVE
+#endif /* !FIVETWELVE */
 #define	CDROM_MODE2_SIZE	2336
 
 /*
@@ -419,7 +419,7 @@
 /*
  * cache parameters
  */
-struct ccs_cache 
+struct ccs_cache
 {
 	u_char	_r1	: 2;	/* reserved */
 	u_char	page_code : 6;	/* page code */
@@ -433,13 +433,13 @@
 	u_char	_r2[8];
 };
 
-#endif  _LINUX_CDROM_H
+#endif /* _LINUX_CDROM_H */
 /*==========================================================================*/
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
  * adjust the settings for this buffer only.  This must remain at the end
- * of the file. 
+ * of the file.
  * ---------------------------------------------------------------------------
  * Local variables:
  * c-indent-level: 8
diff -u --recursive --new-file linux-2.0.39/include/linux/cm206.h linux-2.0.40/include/linux/cm206.h
--- linux-2.0.39/include/linux/cm206.h	Wed May 15 09:06:26 1996
+++ linux-2.0.40/include/linux/cm206.h	Thu Aug 23 18:34:14 2001
@@ -137,7 +137,7 @@
 #if !defined(CDROM_GET_UPC)
 #define CDROM_GET_UPC _IO( 'S', 0x11 )
 #define CDROMRESET _IO( 'S', 0x12 )
-#endif
+#endif /* !defined(CDROM_GET_UPC) */
 
 #ifdef STATISTICS
 
@@ -147,10 +147,10 @@
 #ifdef __KERNEL__
 #define x(a) st_ ## a
 #define y enum
-#else
+#else /* __KERNEL__ */
 #define x(a) #a
-#define y char * stats_name[] = 
-#endif
+#define y char * stats_name[] =
+#endif /* !__KERNEL__ */
 
 y {x(interrupt), x(data_ready), x(fifo_overflow), x(data_error),
      x(crc_error), x(sync_error), x(lost_intr), x(echo),
@@ -160,18 +160,18 @@
      x(bh), x(open), x(ioctl_multisession), x(attention)
 #ifdef __KERNEL__
      , x(last_entry)
-#endif
+#endif /* __KERNEL__ */
  };
 
 #ifdef __KERNEL__
 #define NR_STATS st_last_entry
-#else
+#else /* __KERNEL__ */
 #define NR_STATS (sizeof(stats_name)/sizeof(char*))
-#endif
+#endif /* __KERNEL__ */
 
 #undef y
 #undef x
 
-#endif STATISTICS
+#endif /* STATISTICS */
 
-#endif LINUX_CM206_H
+#endif /* LINUX_CM206_H */
diff -u --recursive --new-file linux-2.0.39/include/linux/if_frad.h linux-2.0.40/include/linux/if_frad.h
--- linux-2.0.39/include/linux/if_frad.h	Thu Jun  4 00:17:49 1998
+++ linux-2.0.40/include/linux/if_frad.h	Thu Aug 23 18:46:45 2001
@@ -132,13 +132,13 @@
    unsigned char  control	__attribute__((packed));
 
    /* for IP packets, this can be the NLPID */
-   unsigned char  pad		__attribute__((packed)); 
+   unsigned char  pad		__attribute__((packed));
 
    unsigned char  NLPID		__attribute__((packed));
    unsigned char  OUI[3]	__attribute__((packed));
    unsigned short PID		__attribute__((packed));
 
-#define IP_NLPID pad 
+#define IP_NLPID pad
 };
 
 /* see RFC 1490 for the definition of the following */
@@ -190,6 +190,6 @@
 int register_frad(const char *name);
 int unregister_frad(const char *name);
 
-#endif __KERNEL__
+#endif /* __KERNEL__ */
 
-#endif
+#endif /* _FRAD_H_ */
diff -u --recursive --new-file linux-2.0.39/include/linux/kernel.h linux-2.0.40/include/linux/kernel.h
--- linux-2.0.39/include/linux/kernel.h	Thu Aug 14 19:05:47 1997
+++ linux-2.0.40/include/linux/kernel.h	Sat Mar  3 16:45:30 2001
@@ -39,8 +39,12 @@
 NORET_TYPE void do_exit(long error_code)
 	ATTRIB_NORET;
 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
-extern int sprintf(char * buf, const char * fmt, ...);
-extern int vsprintf(char *buf, const char *, va_list);
+extern int sprintf(char *buf, const char *fmt, ...)
+	__attribute__ ((format (printf, 2, 3)));
+extern int vsprintf(char *buf, const char *, va_list)
+	__attribute__ ((format (printf, 2, 0)));
+extern int _vsnprintf(char *buf, int n, const char *, va_list)
+	__attribute__ ((format (printf, 3, 0)));
 
 extern int session_of_pgrp(int pgrp);
 
diff -u --recursive --new-file linux-2.0.39/include/linux/md.h linux-2.0.40/include/linux/md.h
--- linux-2.0.39/include/linux/md.h	Mon Jul 13 22:47:39 1998
+++ linux-2.0.40/include/linux/md.h	Thu Aug 23 18:47:08 2001
@@ -3,15 +3,15 @@
           Copyright (C) 1994-96 Marc ZYNGIER
 	  <zyngier@ufr-info-p7.ibp.fr> or
 	  <maz@gloups.fdn.fr>
-	  
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-   
+
    You should have received a copy of the GNU General Public License
    (for example /usr/src/linux/COPYING); if not, write to the Free
-   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #ifndef _MD_H
@@ -271,5 +271,5 @@
 extern void md_wakeup_thread(struct md_thread *thread);
 extern int md_update_sb (int minor);
 
-#endif __KERNEL__
-#endif _MD_H
+#endif /* __KERNEL__ */
+#endif /* _MD_H */
diff -u --recursive --new-file linux-2.0.39/include/linux/optcd.h linux-2.0.40/include/linux/optcd.h
--- linux-2.0.39/include/linux/optcd.h	Tue Jun  4 09:53:46 1996
+++ linux-2.0.40/include/linux/optcd.h	Thu Aug 23 18:35:41 2001
@@ -49,4 +49,4 @@
 #define N_BUFS		6
 
 
-#endif _LINUX_OPTCD_H
+#endif /* _LINUX_OPTCD_H */
diff -u --recursive --new-file linux-2.0.39/include/linux/sbpcd.h linux-2.0.40/include/linux/sbpcd.h
--- linux-2.0.39/include/linux/sbpcd.h	Mon Sep  2 14:18:26 1996
+++ linux-2.0.40/include/linux/sbpcd.h	Thu Aug 23 18:35:16 2001
@@ -117,16 +117,16 @@
 /* tray control: eject tray if no disk is in */
 #if DISTRIBUTION
 #define JUKEBOX 0
-#else
+#else /* DISTRIBUTION */
 #define JUKEBOX 1
-#endif DISTRIBUTION
+#endif /* !DISTRIBUTION */
 
 /* tray control: eject tray after last use */
 #if DISTRIBUTION
 #define EJECT 0
-#else
+#else /* DISTRIBUTION */
 #define EJECT 1
-#endif DISTRIBUTION
+#endif /* !DISTRIBUTION */
 
 /* max. number of audio frames to read with one     */
 /* request (allocates n* 2352 bytes kernel memory!) */
@@ -157,14 +157,13 @@
  * nothing to change below here if you are not fully aware what you're doing
  */
 #ifndef _LINUX_SBPCD_H
-
 #define _LINUX_SBPCD_H
 /*==========================================================================*/
 /*==========================================================================*/
 /*
  * driver's own read_ahead, data mode
  */
-#define SBP_BUFFER_FRAMES 8 
+#define SBP_BUFFER_FRAMES 8
 
 #define LONG_TIMING 0 /* test against timeouts with "gold" CDs on CR-521 */
 #undef  FUTURE
@@ -838,13 +837,13 @@
 
 /*==========================================================================*/
 /*==========================================================================*/
-#endif _LINUX_SBPCD_H
+#endif /* _LINUX_SBPCD_H */
 /*==========================================================================*/
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
  * adjust the settings for this buffer only.  This must remain at the end
- * of the file. 
+ * of the file.
  * ---------------------------------------------------------------------------
  * Local variables:
  * c-indent-level: 8
diff -u --recursive --new-file linux-2.0.39/init/main.c linux-2.0.40/init/main.c
--- linux-2.0.39/init/main.c	Wed Jun 28 14:48:20 2000
+++ linux-2.0.40/init/main.c	Thu Aug 23 18:30:57 2001
@@ -35,13 +35,13 @@
 #include <linux/blk.h>
 #ifdef CONFIG_ROOT_NFS
 #include <linux/nfs_fs.h>
-#endif
+#endif /* CONFIG_ROOT_NFS */
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
-#endif
+#endif /* CONFIG_MTRR */
 #ifdef CONFIG_APM
 #include <linux/apm_bios.h>
-#endif
+#endif /* CONFIG_APM */
 
 #include <asm/bugs.h>
 
@@ -53,7 +53,7 @@
  */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
 #error sorry, your GCC is too old. It builds incorrect kernels.
-#endif
+#endif /* __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) */
 
 extern char _stext, _etext;
 extern const char *linux_banner;
@@ -70,7 +70,7 @@
 extern void init_IRQ(void);
 extern void init_modules(void);
 extern long console_init(long, long);
-extern long kmalloc_init(long,long);
+extern long kmalloc_init(long, long);
 extern void sock_init(void);
 extern unsigned long pci_init(unsigned long, unsigned long);
 extern void sysctl_init(void);
@@ -116,108 +116,108 @@
 extern void reboot_setup(char *str, int *ints);
 #ifdef CONFIG_CDU31A
 extern void cdu31a_setup(char *str, int *ints);
-#endif CONFIG_CDU31A
+#endif /* CONFIG_CDU31A */
 #ifdef CONFIG_MCD
 extern void mcd_setup(char *str, int *ints);
-#endif CONFIG_MCD
+#endif /* CONFIG_MCD */
 #ifdef CONFIG_MCDX
 extern void mcdx_setup(char *str, int *ints);
-#endif CONFIG_MCDX
+#endif /* CONFIG_MCDX */
 #ifdef CONFIG_SBPCD
 extern void sbpcd_setup(char *str, int *ints);
-#endif CONFIG_SBPCD
+#endif /* CONFIG_SBPCD */
 #ifdef CONFIG_AZTCD
 extern void aztcd_setup(char *str, int *ints);
-#endif CONFIG_AZTCD
+#endif /* CONFIG_AZTCD */
 #ifdef CONFIG_CDU535
 extern void sonycd535_setup(char *str, int *ints);
-#endif CONFIG_CDU535
+#endif /* CONFIG_CDU535 */
 #ifdef CONFIG_GSCD
 extern void gscd_setup(char *str, int *ints);
-#endif CONFIG_GSCD
+#endif /* CONFIG_GSCD */
 #ifdef CONFIG_CM206
 extern void cm206_setup(char *str, int *ints);
-#endif CONFIG_CM206
+#endif /* CONFIG_CM206 */
 #ifdef CONFIG_OPTCD
 extern void optcd_setup(char *str, int *ints);
-#endif CONFIG_OPTCD
+#endif /* CONFIG_OPTCD */
 #ifdef CONFIG_SJCD
 extern void sjcd_setup(char *str, int *ints);
-#endif CONFIG_SJCD
+#endif /* CONFIG_SJCD */
 #ifdef CONFIG_ISP16_CDI
 extern void isp16_setup(char *str, int *ints);
-#endif CONFIG_ISP16_CDI
+#endif /* CONFIG_ISP16_CDI */
 #ifdef CONFIG_BLK_DEV_RAM
 static void ramdisk_start_setup(char *str, int *ints);
 static void load_ramdisk(char *str, int *ints);
 static void prompt_ramdisk(char *str, int *ints);
 static void ramdisk_size(char *str, int *ints);
 #ifdef CONFIG_BLK_DEV_INITRD
-static void no_initrd(char *s,int *ints);
-#endif
-#endif CONFIG_BLK_DEV_RAM
+static void no_initrd(char *s, int *ints);
+#endif /* CONFIG_BLK_DEV_INITRD */
+#endif /* CONFIG_BLK_DEV_RAM */
 #ifdef CONFIG_ISDN_DRV_ICN
 extern void icn_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_ISDN_DRV_ICN */
 #ifdef CONFIG_ISDN_DRV_HISAX
 extern void HiSax_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_ISDN_DRV_HISAX */
 #ifdef CONFIG_ISDN_DRV_PCBIT
 extern void pcbit_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_ISDN_DRV_PCBIT */
 
 #ifdef CONFIG_ATARIMOUSE
 extern void atari_mouse_setup (char *str, int *ints);
-#endif
+#endif /* CONFIG_ATARIMOUSE */
 #ifdef CONFIG_DMASOUND
 extern void dmasound_setup (char *str, int *ints);
-#endif
+#endif /* CONFIG_DMASOUND */
 #ifdef CONFIG_ATARI_SCSI
 extern void atari_scsi_setup (char *str, int *ints);
-#endif
+#endif /* CONFIG_ATARI_SCSI */
 extern void wd33c93_setup (char *str, int *ints);
 extern void gvp11_setup (char *str, int *ints);
 
 #ifdef CONFIG_CYCLADES
 extern void cy_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_CYCLADES */
 #ifdef CONFIG_DIGI
 extern void pcxx_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_DIGI */
 #ifdef CONFIG_RISCOM8
 extern void riscom8_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_RISCOM8 */
 #ifdef CONFIG_SPECIALIX
 extern void specialix_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_SPECIALIX */
 #ifdef CONFIG_BAYCOM
 extern void baycom_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_BAYCOM */
 
 #ifdef CONFIG_PARIDE_PD
 extern void pd_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_PARIDE_PD */
 #ifdef CONFIG_PARIDE_PF
 extern void pf_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_PARIDE_PF */
 #ifdef CONFIG_PARIDE_PT
 extern void pt_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_PARIDE_PT */
 #ifdef CONFIG_PARIDE_PG
 extern void pg_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_PARIDE_PG */
 #ifdef CONFIG_PARIDE_PCD
 extern void pcd_setup(char *str, int *ints);
-#endif
+#endif /* CONFIG_PARIDE_PCD */
 #ifdef CONFIG_BLK_CPQ_DA
 #ifdef CONFIG_BLK_CPQ_DA_EISA
 extern void cpqarray_setup(char *str, int *ints);
-#endif
-#endif
+#endif /* CONFIG_BLK_CPQ_DA_EISA */
+#endif /* CONFIG_BLK_CPQ_DA */
 
 #if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
 extern void ipc_init(void);
-#endif
+#endif /* defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD) */
 
 /*
  * Boot command-line arguments
@@ -239,8 +239,8 @@
 extern int rd_image_start;	/* starting block # of image */
 #ifdef CONFIG_BLK_DEV_INITRD
 kdev_t real_root_dev;
-#endif
-#endif
+#endif /* CONFIG_BLK_DEV_INITRD */
+#endif /* CONFIG_BLK_DEV_RAM */
 
 int root_mountflags = MS_RDONLY;
 char *execute_command = 0;
@@ -248,7 +248,7 @@
 #ifdef CONFIG_ROOT_NFS
 char nfs_root_name[NFS_ROOT_NAME_LEN] = { "default" };
 char nfs_root_addrs[NFS_ROOT_ADDRS_LEN] = { "" };
-#endif
+#endif /* CONFIG_ROOT_NFS */
 
 extern void dquot_init(void);
 
@@ -258,7 +258,7 @@
 static char * argv_rc[] = { "/bin/sh", NULL };
 static char * envp_rc[] = { "HOME=/", "TERM=linux", NULL };
 
-static char * argv[] = { "-/bin/sh",NULL };
+static char * argv[] = { "-/bin/sh", NULL };
 static char * envp[] = { "HOME=/usr/root", "TERM=linux", NULL };
 
 char *get_options(char *str, int *ints)
@@ -267,8 +267,8 @@
 	int i=1;
 
 	while (cur && isdigit(*cur) && i <= 10) {
-		ints[i++] = simple_strtoul(cur,NULL,0);
-		if ((cur = strchr(cur,',')) != NULL)
+		ints[i++] = simple_strtoul(cur, NULL, 0);
+		if ((cur = strchr(cur, ',')) != NULL)
 			cur++;
 	}
 	ints[0] = i-1;
@@ -282,9 +282,9 @@
 	else
 #ifdef CONFIG_PROFILE_SHIFT
 		prof_shift = CONFIG_PROFILE_SHIFT;
-#else
+#else /* CONFIG_PROFILE_SHIFT */
 		prof_shift = 2;
-#endif
+#endif /* !CONFIG_PROFILE_SHIFT */
 }
 
 struct kernel_param {
@@ -303,8 +303,8 @@
 	{ "ramdisk_size=", ramdisk_size },
 #ifdef CONFIG_BLK_DEV_INITRD
 	{ "noinitrd", no_initrd },
-#endif
-#endif
+#endif /* CONFIG_BLK_DEV_INITRD */
+#endif /* CONFIG_BLK_DEV_RAM */
 	{ "swap=", swap_setup },
 	{ "buff=", buff_setup },
 	{ "panic=", panic_setup },
@@ -313,182 +313,182 @@
 	{ "no-hlt", no_halt },
 	{ "no387", no_387 },
 	{ "reboot=", reboot_setup },
-#endif
+#endif /* CONFIG_BUGi386 */
 #ifdef CONFIG_INET
 	{ "ether=", eth_setup },
-#endif
+#endif /* CONFIG_INET */
 #ifdef CONFIG_PRINTER
         { "lp=", lp_setup },
-#endif
+#endif /* CONFIG_PRINTER */
 #ifdef CONFIG_SCSI
 	{ "max_scsi_luns=", scsi_luns_setup },
-#endif
+#endif /* CONFIG_SCSI */
 #ifdef CONFIG_SCSI_ADVANSYS
 	{ "advansys=", advansys_setup },
-#endif
+#endif /* CONFIG_SCSI_ADVANSYS */
 #if defined(CONFIG_BLK_DEV_HD)
 	{ "hd=", hd_setup },
-#endif
+#endif /* defined(CONFIG_BLK_DEV_HD) */
 #ifdef CONFIG_CHR_DEV_ST
 	{ "st=", st_setup },
-#endif
+#endif /* CONFIG_CHR_DEV_ST */
 #ifdef CONFIG_BUSMOUSE
 	{ "bmouse=", bmouse_setup },
-#endif
+#endif /* CONFIG_BUSMOUSE */
 #ifdef CONFIG_MS_BUSMOUSE
 	{ "msmouse=", msmouse_setup },
-#endif
+#endif /* CONFIG_MS_BUSMOUSE */
 #ifdef CONFIG_SCSI_SEAGATE
 	{ "st0x=", st0x_setup },
 	{ "tmc8xx=", tmc8xx_setup },
-#endif
+#endif /* CONFIG_SCSI_SEAGATE */
 #ifdef CONFIG_SCSI_T128
 	{ "t128=", t128_setup },
-#endif
+#endif /* CONFIG_SCSI_T128 */
 #ifdef CONFIG_SCSI_PAS16
 	{ "pas16=", pas16_setup },
-#endif
+#endif /* CONFIG_SCSI_PAS16 */
 #ifdef CONFIG_SCSI_GENERIC_NCR5380
 	{ "ncr5380=", generic_NCR5380_setup },
 	{ "ncr53c400=", generic_NCR53C400_setup },
-#endif
+#endif /* CONFIG_SCSI_GENERIC_NCR5380 */
 #ifdef CONFIG_SCSI_AHA152X
 	{ "aha152x=", aha152x_setup},
-#endif
+#endif /* CONFIG_SCSI_AHA152X */
 #ifdef CONFIG_SCSI_AHA1542
 	{ "aha1542=", aha1542_setup},
-#endif
+#endif /* CONFIG_SCSI_AHA1542 */
 #ifdef CONFIG_SCSI_GDTH
 	{ "gdth=", gdth_setup},
-#endif
+#endif /* CONFIG_SCSI_GDTH */
 #ifdef CONFIG_SCSI_AIC7XXX
 	{ "aic7xxx=", aic7xxx_setup},
-#endif
+#endif /* CONFIG_SCSI_AIC7XXX */
 #ifdef CONFIG_SCSI_BUSLOGIC
 	{ "BusLogic=", BusLogic_Setup},
-#endif
+#endif /* CONFIG_SCSI_BUSLOGIC */
 #ifdef CONFIG_SCSI_NCR53C8XX
 	{ "ncr53c8xx=", ncr53c8xx_setup},
-#endif
+#endif /* CONFIG_SCSI_NCR53C8XX */
 #ifdef CONFIG_SCSI_EATA
 	{ "eata=", eata2x_setup},
-#endif
+#endif /* CONFIG_SCSI_EATA */
 #ifdef CONFIG_SCSI_U14_34F
 	{ "u14-34f=", u14_34f_setup},
-#endif
+#endif /* CONFIG_SCSI_U14_34F */
 #ifdef CONFIG_SCSI_AM53C974
         { "AM53C974=", AM53C974_setup},
-#endif
+#endif /* CONFIG_SCSI_AM53C974 */
 #ifdef CONFIG_SCSI_NCR53C406A
 	{ "ncr53c406a=", NCR53c406a_setup},
-#endif
+#endif /* CONFIG_SCSI_NCR53C406A */
 #ifdef CONFIG_SCSI_SYM53C416
-	{ "sym53c416=", sym53c416_setup}, 
-#endif
+	{ "sym53c416=", sym53c416_setup},
+#endif /* CONFIG_SCSI_SYM53C416 */
 #ifdef CONFIG_SCSI_FUTURE_DOMAIN
 	{ "fdomain=", fdomain_setup},
-#endif
+#endif /* CONFIG_SCSI_FUTURE_DOMAIN */
 #ifdef CONFIG_SCSI_IN2000
 	{ "in2000=", in2000_setup},
-#endif
+#endif /* CONFIG_SCSI_IN2000 */
 #ifdef CONFIG_SCSI_7000FASST
 	{ "wd7000=", wd7000_setup},
-#endif
+#endif /* CONFIG_SCSI_7000FASST */
 #ifdef CONFIG_SCSI_PPA
         { "ppa=", ppa_setup },
-#endif
-#if defined(CONFIG_SCSI_DC390T) && ! defined(CONFIG_SCSI_DC390T_NOGENSUPP)
+#endif /* CONFIG_SCSI_PPA */
+#if defined(CONFIG_SCSI_DC390T) && !defined(CONFIG_SCSI_DC390T_NOGENSUPP)
 	{ "tmscsim=", dc390_setup },
-#endif
+#endif /* defined(CONFIG_SCSI_DC390T) && !defined(CONFIG_SCSI_DC390T_NOGENSUPP) */
 #ifdef CONFIG_BLK_DEV_XD
 	{ "xd=", xd_setup },
 	{ "xd_geo=", xd_manual_geo_init },
-#endif
+#endif /* CONFIG_BLK_DEV_XD */
 #ifdef CONFIG_BLK_DEV_FD
 	{ "floppy=", floppy_setup },
-#endif
+#endif /* CONFIG_BLK_DEV_FD */
 #ifdef CONFIG_CDU31A
 	{ "cdu31a=", cdu31a_setup },
-#endif CONFIG_CDU31A
+#endif /* CONFIG_CDU31A */
 #ifdef CONFIG_MCD
 	{ "mcd=", mcd_setup },
-#endif CONFIG_MCD
+#endif /* CONFIG_MCD */
 #ifdef CONFIG_MCDX
 	{ "mcdx=", mcdx_setup },
-#endif CONFIG_MCDX
+#endif /* CONFIG_MCDX */
 #ifdef CONFIG_SBPCD
 	{ "sbpcd=", sbpcd_setup },
-#endif CONFIG_SBPCD
+#endif /* CONFIG_SBPCD */
 #ifdef CONFIG_AZTCD
 	{ "aztcd=", aztcd_setup },
-#endif CONFIG_AZTCD
+#endif /* CONFIG_AZTCD */
 #ifdef CONFIG_CDU535
 	{ "sonycd535=", sonycd535_setup },
-#endif CONFIG_CDU535
+#endif /* CONFIG_CDU535 */
 #ifdef CONFIG_GSCD
 	{ "gscd=", gscd_setup },
-#endif CONFIG_GSCD
+#endif /* CONFIG_GSCD */
 #ifdef CONFIG_CM206
 	{ "cm206=", cm206_setup },
-#endif CONFIG_CM206
+#endif /* CONFIG_CM206 */
 #ifdef CONFIG_OPTCD
 	{ "optcd=", optcd_setup },
-#endif CONFIG_OPTCD
+#endif /* CONFIG_OPTCD */
 #ifdef CONFIG_SJCD
 	{ "sjcd=", sjcd_setup },
-#endif CONFIG_SJCD
+#endif /* CONFIG_SJCD */
 #ifdef CONFIG_ISP16_CDI
 	{ "isp16=", isp16_setup },
-#endif CONFIG_ISP16_CDI
+#endif /* CONFIG_ISP16_CDI */
 #ifdef CONFIG_SOUND
 	{ "sound=", sound_setup },
-#endif
+#endif /* CONFIG_SOUND */
 #ifdef CONFIG_ISDN_DRV_ICN
 	{ "icn=", icn_setup },
-#endif
+#endif /* CONFIG_ISDN_DRV_ICN */
 #ifdef CONFIG_ISDN_DRV_HISAX
        { "hisax=", HiSax_setup },
        { "HiSax=", HiSax_setup },
-#endif
+#endif /* CONFIG_ISDN_DRV_HISAX */
 #ifdef CONFIG_ISDN_DRV_PCBIT
 	{ "pcbit=", pcbit_setup },
-#endif
+#endif /* CONFIG_ISDN_DRV_PCBIT */
 #ifdef CONFIG_ATARIMOUSE
 	{ "atamouse=", atari_mouse_setup },
-#endif
+#endif /* CONFIG_ATARIMOUSE */
 #ifdef CONFIG_DMASOUND
 	{ "dmasound=", dmasound_setup },
-#endif
+#endif /* CONFIG_DMASOUND */
 #ifdef CONFIG_ATARI_SCSI
 	{ "atascsi=", atari_scsi_setup },
-#endif
+#endif /* CONFIG_ATARI_SCSI */
 #if defined(CONFIG_A3000_SCSI) || defined(CONFIG_A2091_SCSI) \
 	    || defined(CONFIG_GVP11_SCSI)
 	{ "wd33c93=", wd33c93_setup },
-#endif
+#endif /* defined(CONFIG_A3000_SCSI) || defined(CONFIG_A2091_SCSI) || defined(CONFIG_GVP11_SCSI */
 #if defined(CONFIG_GVP11_SCSI)
 	{ "gvp11=", gvp11_setup },
-#endif
+#endif /* defined(CONFIG_GVP11_SCSI) */
 #ifdef CONFIG_CYCLADES
 	{ "cyclades=", cy_setup },
-#endif
+#endif /* CONFIG_CYCLADES */
 #ifdef CONFIG_DIGI
 	{ "digi=", pcxx_setup },
-#endif
+#endif /* CONFIG_DIGI */
 #ifdef CONFIG_RISCOM8
 	{ "riscom8=", riscom8_setup },
-#endif
+#endif /* CONFIG_RISCOM8 */
 #ifdef CONFIG_SPECIALIX
 	{ "specialix=", specialix_setup },
-#endif
+#endif /* CONFIG_SPECIALIX */
 #ifdef CONFIG_BAYCOM
 	{ "baycom=", baycom_setup },
-#endif
+#endif /* CONFIG_BAYCOM */
 #ifdef CONFIG_BLK_CPQ_DA
 #ifdef CONFIG_BLK_CPQ_DA_EISA
        { "smart2=", cpqarray_setup },
-#endif
-#endif
+#endif /* CONFIG_BLK_CPQ_DA_EISA */
+#endif /* CONFIG_BLK_CPQ_DA */
 	{ 0, 0 }
 };
 
@@ -496,22 +496,22 @@
 
 #ifdef CONFIG_PARIDE_PD
        { "pd.", pd_setup },
-#endif
+#endif /* CONFIG_PARIDE_PD */
 #ifdef CONFIG_PARIDE_PCD
        { "pcd.", pcd_setup },
-#endif
+#endif /* CONFIG_PARIDE_PCD */
 #ifdef CONFIG_PARIDE_PF
        { "pf.", pf_setup },
-#endif
+#endif /* CONFIG_PARIDE_PF */
 #ifdef CONFIG_PARIDE_PT
        { "pt.", pt_setup },
-#endif
+#endif /* CONFIG_PARIDE_PT */
 #ifdef CONFIG_PARIDE_PG
        { "pg.", pg_setup },
-#endif
+#endif /* CONFIG_PARIDE_PG */
 #ifdef CONFIG_APM
 	{ "apm=", apm_setup },
-#endif
+#endif /* CONFIG_APM */
        { 0, 0 }
 } ;
 
@@ -541,7 +541,7 @@
 		rd_size = ints[1];
 }
 
-#endif
+#endif /* CONFIG_BLK_DEV_RAM */
 
 static int checksetup(char *line)
 {
@@ -550,15 +550,15 @@
 
 #ifdef CONFIG_BLK_DEV_IDE
 	/* ide driver needs the basic string, rather than pre-processed values */
-	if (!strncmp(line,"ide",3) || (!strncmp(line,"hd",2) && line[2] != '=')) {
+	if (!strncmp(line, "ide", 3) || (!strncmp(line, "hd", 2) && line[2] != '=')) {
 		ide_setup(line);
 		return 1;
 	}
-#endif
+#endif /* CONFIG_BLK_DEV_IDE */
 	while (bootsetups[i].str) {
 		int n = strlen(bootsetups[i].str);
-		if (!strncmp(line,bootsetups[i].str,n)) {
-			bootsetups[i].setup_func(get_options(line+n,ints), ints);
+		if (!strncmp(line, bootsetups[i].str, n)) {
+			bootsetups[i].setup_func(get_options(line+n, ints), ints);
 			return 1;
 		}
 		i++;
@@ -566,7 +566,7 @@
 
         for (i=0; raw_params[i].str; i++) {
                 int n = strlen(raw_params[i].str);
-                if (!strncmp(line,raw_params[i].str,n)) {
+                if (!strncmp(line, raw_params[i].str, n)) {
                         raw_params[i].setup_func(line+n, NULL);
                         return 1;
                 }
@@ -581,7 +581,7 @@
 
 #if defined(__SMP__) && defined(__i386__)
 unsigned long smp_loops_per_tick = 1000000;
-#endif
+#endif /* defined(__SMP__) && defined(__i386__) */
 
 /* This is the number of bits of precision for the loops_per_second.  Each
    bit takes on average 1.5/HZ seconds.  This (like the original) is a little
@@ -608,7 +608,7 @@
 		ticks = jiffies - ticks;
 		if (ticks)
 			break;
-		}
+	}
 
 /* Do a binary approximation to get loops_per_second set to equal one clock
    (up to lps_precision bits) */
@@ -633,7 +633,7 @@
 
 #if defined(__SMP__) && defined(__i386__)
 	smp_loops_per_tick = loops_per_sec / 400;
-#endif
+#endif /* defined(__SMP__) && defined(__i386__) */
 }
 
 static void parse_root_dev(char * line)
@@ -674,23 +674,23 @@
 		{ "sdo",     0x08e0 },
 		{ "sdp",     0x08f0 },
 #ifdef CONFIG_BLK_DEV_DAC960
-		{ "rd/c0d0p",0x3000 },
-		{ "rd/c0d1p",0x3008 },
-		{ "rd/c0d2p",0x3010 },
-		{ "rd/c0d3p",0x3018 },
-		{ "rd/c0d4p",0x3020 },
-		{ "rd/c0d5p",0x3028 },
-		{ "rd/c0d6p",0x3030 },
-		{ "rd/c0d7p",0x3038 },
-		{ "rd/c0d8p",0x3040 },
-		{ "rd/c0d9p",0x3048 },
-		{ "rd/c0d10p",0x3050 },
-		{ "rd/c0d11p",0x3058 },
-		{ "rd/c0d12p",0x3060 },
-		{ "rd/c0d13p",0x3068 },
-		{ "rd/c0d14p",0x3070 },
-		{ "rd/c0d15p",0x3078 },
-#endif
+		{ "rd/c0d0p", 0x3000 },
+		{ "rd/c0d1p", 0x3008 },
+		{ "rd/c0d2p", 0x3010 },
+		{ "rd/c0d3p", 0x3018 },
+		{ "rd/c0d4p", 0x3020 },
+		{ "rd/c0d5p", 0x3028 },
+		{ "rd/c0d6p", 0x3030 },
+		{ "rd/c0d7p", 0x3038 },
+		{ "rd/c0d8p", 0x3040 },
+		{ "rd/c0d9p", 0x3048 },
+		{ "rd/c0d10p", 0x3050 },
+		{ "rd/c0d11p", 0x3058 },
+		{ "rd/c0d12p", 0x3060 },
+		{ "rd/c0d13p", 0x3068 },
+		{ "rd/c0d14p", 0x3070 },
+		{ "rd/c0d15p", 0x3078 },
+#endif /* CONFIG_BLK_DEV_DAC960 */
 		{ "fd",      0x0200 },
 		{ "xda",     0x0d00 },
 		{ "xdb",     0x0d40 },
@@ -704,26 +704,26 @@
 		{ "sbpcd",   0x1900 },
 		{ "sonycd",  0x1800 },
 #ifdef CONFIG_PARIDE_PD
-       		{ "pda",     0x2d00 },
-       		{ "pdb",     0x2d10 },
-       		{ "pdc",     0x2d20 },
-       		{ "pdd",     0x2d30 },
-#endif
+		{ "pda",     0x2d00 },
+		{ "pdb",     0x2d10 },
+		{ "pdc",     0x2d20 },
+		{ "pdd",     0x2d30 },
+#endif /* CONFIG_PARIDE_PD */
 #ifdef CONFIG_PARIDE_PCD
-     	  	{ "pcd",     0x2e00 },
-#endif
+		{ "pcd",     0x2e00 },
+#endif /* CONFIG_PARIDE_PCD */
 #ifdef CONFIG_PARIDE_PF
-	       	{ "pf",      0x2f00 },
-#endif
+		{ "pf",      0x2f00 },
+#endif /* CONFIG_PARIDE_PF */
 		{ NULL, 0 }
 	};
 
-	if (strncmp(line,"/dev/",5) == 0) {
+	if (strncmp(line, "/dev/", 5) == 0) {
 		struct dev_name_struct *dev = devices;
 		line += 5;
 		do {
 			int len = strlen(dev->name);
-			if (strncmp(line,dev->name,len) == 0) {
+			if (strncmp(line, dev->name, len) == 0) {
 				line += len;
 				base = dev->num;
 				break;
@@ -731,7 +731,7 @@
 			dev++;
 		} while (dev->name);
 	}
-	ROOT_DEV = to_kdev_t(base + simple_strtoul(line,NULL,base?10:16));
+	ROOT_DEV = to_kdev_t(base + simple_strtoul(line, NULL, base ? 10 : 16));
 }
 
 /*
@@ -755,12 +755,12 @@
 	envs = 1;	/* TERM is set to 'linux' by default */
 	next = line;
 	while ((line = next) != NULL) {
-		if ((next = strchr(line,' ')) != NULL)
+		if ((next = strchr(line, ' ')) != NULL)
 			*next++ = 0;
 		/*
 		 * check for kernel options first..
 		 */
-		if (!strncmp(line,"root=",5)) {
+		if (!strncmp(line, "root=", 5)) {
 			parse_root_dev(line+5);
 			continue;
 		}
@@ -786,20 +786,20 @@
 			nfs_root_addrs[sizeof(nfs_root_addrs)-1] = '\0';
 			continue;
 		}
-#endif
-		if (!strcmp(line,"ro")) {
+#endif /* CONFIG_ROOT_NFS */
+		if (!strcmp(line, "ro")) {
 			root_mountflags |= MS_RDONLY;
 			continue;
 		}
-		if (!strcmp(line,"rw")) {
+		if (!strcmp(line, "rw")) {
 			root_mountflags &= ~MS_RDONLY;
 			continue;
 		}
-		if (!strcmp(line,"debug")) {
+		if (!strcmp(line, "debug")) {
 			console_loglevel = 10;
 			continue;
 		}
-		if (!strncmp(line,"init=",5)) {
+		if (!strncmp(line, "init=", 5)) {
 			line += 5;
 			execute_command = line;
 			continue;
@@ -810,7 +810,7 @@
 		 * Then check if it's an environment variable or
 		 * an option.
 		 */
-		if (strchr(line,'=')) {
+		if (strchr(line, '=')) {
 			if (envs >= MAX_INIT_ENVS)
 				break;
 			envp_init[++envs] = line;
@@ -833,25 +833,25 @@
 /*
  *	Uniprocessor idle thread
  */
- 
+
 int cpu_idle(void *unused)
 {
 	for(;;)
 		idle();
 }
 
-#else
+#else /* !__SMP__ */
 
 /*
  *	Multiprocessor idle thread is in arch/...
  */
- 
+
 extern int cpu_idle(void * unused);
 
 /*
  *	Activate a secondary processor.
  */
- 
+
 asmlinkage void start_secondary(void)
 {
 	trap_init();
@@ -902,26 +902,26 @@
 		task[i]->next_run = task[i]->prev_run = task[i];
 		sti();
 	}
-}		
+}
 
 /*
  *	The autoprobe routines assume CPU#0 on the i386
  *	so we don't actually set the game in motion until
  *	they are finished.
  */
- 
+
 static void smp_begin(void)
 {
 	smp_threads_ready=1;
 	smp_commence();
 }
-	
-#endif
+
+#endif /* __SMP__ */
 
 /*
  *	Activate the first processor.
  */
- 
+
 asmlinkage void start_kernel(void)
 {
 	char * command_line;
@@ -932,18 +932,18 @@
 
 #ifdef __SMP__
 	static int first_cpu=1;
-	
+
 	if(!first_cpu)
 		start_secondary();
 	first_cpu=0;
-	
-#endif	
+
+#endif /* __SMP__ */
 /*
  * Interrupts are still disabled. Do necessary setups, then
  * enable them
  */
 	setup_arch(&command_line, &memory_start, &memory_end);
-	memory_start = paging_init(memory_start,memory_end);
+	memory_start = paging_init(memory_start, memory_end);
 	trap_init();
 	init_IRQ();
 	sched_init();
@@ -951,15 +951,15 @@
 	parse_options(command_line);
 #ifdef CONFIG_MODULES
 	init_modules();
-#endif
+#endif /* CONFIG_MODULES */
 #ifdef CONFIG_PROFILE
 	if (!prof_shift)
 #ifdef CONFIG_PROFILE_SHIFT
 		prof_shift = CONFIG_PROFILE_SHIFT;
-#else
+#else /* CONFIG_PROFILE_SHIFT */
 		prof_shift = 2;
-#endif
-#endif
+#endif /* !CONFIG_PROFILE_SHIFT */
+#endif /* CONFIG_PROFILE */
 	if (prof_shift) {
 		prof_buffer = (unsigned int *) memory_start;
 		/* only text is profiled */
@@ -968,29 +968,29 @@
 		memory_start += prof_len * sizeof(unsigned int);
 		memset(prof_buffer, 0, prof_len * sizeof(unsigned int));
 	}
-	memory_start = console_init(memory_start,memory_end);
+	memory_start = console_init(memory_start, memory_end);
 #ifdef CONFIG_PCI
-	memory_start = pci_init(memory_start,memory_end);
-#endif
-	memory_start = kmalloc_init(memory_start,memory_end);
+	memory_start = pci_init(memory_start, memory_end);
+#endif /* CONFIG_PCI */
+	memory_start = kmalloc_init(memory_start, memory_end);
 	sti();
 	calibrate_delay();
-	memory_start = inode_init(memory_start,memory_end);
-	memory_start = file_table_init(memory_start,memory_end);
-	memory_start = name_cache_init(memory_start,memory_end);
+	memory_start = inode_init(memory_start, memory_end);
+	memory_start = file_table_init(memory_start, memory_end);
+	memory_start = name_cache_init(memory_start, memory_end);
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start && initrd_start < memory_start) {
 		printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - "
-		    "disabling it.\n",initrd_start,memory_start);
+		    "disabling it.\n", initrd_start, memory_start);
 		initrd_start = 0;
 	}
-#endif
-	mem_init(memory_start,memory_end);
+#endif /* CONFIG_BLK_DEV_INITRD */
+	mem_init(memory_start, memory_end);
 	buffer_init();
 	sock_init();
 #if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
 	ipc_init();
-#endif
+#endif /* defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD) */
 	dquot_init();
 	arch_syms_export();
 	sti();
@@ -998,16 +998,16 @@
 
 #if defined(CONFIG_MTRR) && defined(__SMP__)
 	init_mtrr_config();
-#endif
+#endif /* defined(CONFIG_MTRR) && defined(__SMP__) */
 
 
 	printk(linux_banner);
 #ifdef __SMP__
 	smp_init();
-#endif
+#endif /* __SMP__ */
 	sysctl_init();
-	/* 
-	 *	We count on the initial thread going ok 
+	/*
+	 *	We count on the initial thread going ok
 	 *	Like idlers init is an unlocked kernel thread, which will
 	 *	make syscalls (and thus be locked).
 	 */
@@ -1021,7 +1021,7 @@
  *
  * Right now task[0] just does a infinite idle loop.
  */
- 	cpu_idle(NULL);
+	cpu_idle(NULL);
 }
 
 static int printf(const char *fmt, ...)
@@ -1030,7 +1030,7 @@
 	int i;
 
 	va_start(args, fmt);
-	write(1,printbuf,i=vsprintf(printbuf, fmt, args));
+	write(1, printbuf, i=vsprintf(printbuf, fmt, args));
 	va_end(args);
 	return i;
 }
@@ -1038,16 +1038,16 @@
 static int do_rc(void * rc)
 {
 	close(0);
-	if (open(rc,O_RDONLY,0))
+	if (open(rc, O_RDONLY, 0))
 		return -1;
 	return execve("/bin/sh", argv_rc, envp_rc);
 }
 
 static int do_shell(void * shell)
 {
-	close(0);close(1);close(2);
+	close(0); close(1); close(2);
 	setsid();
-	(void) open("/dev/tty1",O_RDWR,0);
+	(void) open("/dev/tty1", O_RDWR, 0);
 	(void) dup(0);
 	(void) dup(0);
 	return execve(shell, argv, envp);
@@ -1060,24 +1060,24 @@
 
 	close(0);close(1);close(2);
 	setsid();
-	(void) open("/dev/tty1",O_RDWR,0);
+	(void) open("/dev/tty1", O_RDWR, 0);
 	(void) dup(0);
 	(void) dup(0);
 	return execve(shell, argv, envp_init);
 }
 
-static void no_initrd(char *s,int *ints)
+static void no_initrd(char *s, int *ints)
 {
 	mount_initrd = 0;
 }
-#endif
+#endif /* CONFIG_BLK_DEV_INITRD */
 
 static int init(void * unused)
 {
-	int pid,i;
+	int pid, i;
 #ifdef CONFIG_BLK_DEV_INITRD
 	int real_root_mountflags;
-#endif
+#endif /* CONFIG_BLK_DEV_INITRD */
 
 	/* Launch bdflush from here, instead of the old syscall way. */
 	kernel_thread(bdflush, NULL, 0);
@@ -1090,7 +1090,7 @@
 	real_root_mountflags = root_mountflags;
 	if (initrd_start && mount_initrd) root_mountflags &= ~MS_RDONLY;
 	else mount_initrd =0;
-#endif
+#endif /* CONFIG_BLK_DEV_INITRD */
 	setup();
 
 #ifdef __SMP__
@@ -1098,11 +1098,11 @@
 	 *	With the devices probed and setup we can
 	 *	now enter SMP mode.
 	 */
-	
+
 	smp_begin();
-#endif	
+#endif /* __SMP__ */
 
-	#ifdef CONFIG_UMSDOS_FS
+#ifdef CONFIG_UMSDOS_FS
 	{
 		/*
 			When mounting a umsdos fs as root, we detect
@@ -1110,47 +1110,47 @@
 			pseudo_root is defined in fs/umsdos/inode.c
 		*/
 		extern struct inode *pseudo_root;
-		if (pseudo_root != NULL){
+		if (pseudo_root != NULL) {
 			current->fs->root = pseudo_root;
 			current->fs->pwd  = pseudo_root;
 		}
 	}
-	#endif
+#endif /* CONFIG_UMSDOS_FS */
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	root_mountflags = real_root_mountflags;
-	if (mount_initrd && ROOT_DEV != real_root_dev && ROOT_DEV == MKDEV(RAMDISK_MAJOR,0)) {
+	if (mount_initrd && ROOT_DEV != real_root_dev && ROOT_DEV == MKDEV(RAMDISK_MAJOR, 0)) {
 		int error;
 
 		pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
 		if (pid>0)
 			while (pid != wait(&i));
 		if (real_root_dev != MKDEV(RAMDISK_MAJOR, 0)) {
-			error = change_root(real_root_dev,"/initrd");
+			error = change_root(real_root_dev, "/initrd");
 			if (error)
 				printk(KERN_ERR "Change root to /initrd: "
-				    "error %d\n",error);
+				    "error %d\n", error);
 		}
 	}
-#endif
-	
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 	/*
 	 *	This keeps serial console MUCH cleaner, but does assume
 	 *	the console driver checks there really is a video device
 	 *	attached (Sparc effectively does).
 	 */
 
-	if ((open("/dev/tty1",O_RDWR,0) < 0) &&
-	    (open("/dev/ttyS0",O_RDWR,0) < 0))
+	if ((open("/dev/tty1", O_RDWR, 0) < 0) &&
+	    (open("/dev/ttyS0", O_RDWR, 0) < 0))
 		printk("Unable to open an initial console.\n");
-			
+
 	(void) dup(0);
 	(void) dup(0);
 
 	if (!execute_command) {
-		execve("/etc/init",argv_init,envp_init);
-		execve("/bin/init",argv_init,envp_init);
-		execve("/sbin/init",argv_init,envp_init);
+		execve("/etc/init", argv_init, envp_init);
+		execve("/bin/init", argv_init, envp_init);
+		execve("/sbin/init", argv_init, envp_init);
 		/* if this fails, fall through to original stuff */
 
 		pid = kernel_thread(do_rc, "/etc/rc", SIGCHLD);
@@ -1170,7 +1170,7 @@
 		while (1)
 			if (pid == wait(&i))
 				break;
-		printf("\n\rchild %d died with code %04x\n\r",pid,i);
+		printf("\n\rchild %d died with code %04x\n\r", pid, i);
 		sync();
 	}
 	return -1;
diff -u --recursive --new-file linux-2.0.39/kernel/printk.c linux-2.0.40/kernel/printk.c
--- linux-2.0.39/kernel/printk.c	Fri Jun  7 10:54:06 1996
+++ linux-2.0.40/kernel/printk.c	Sat Mar  3 16:45:30 2001
@@ -158,7 +158,7 @@
 	save_flags(flags);
 	cli();
 	va_start(args, fmt);
-	i = vsprintf(buf + 3, fmt, args); /* hopefully i < sizeof(buf)-4 */
+	i = _vsnprintf(buf + 3, sizeof(buf) - sizeof(buf) / 8 - 3, fmt, args);
 	buf_end = buf + 3 + i;
 	va_end(args);
 	for (p = buf + 3; p < buf_end; p++) {
diff -u --recursive --new-file linux-2.0.39/kernel/sched.c linux-2.0.40/kernel/sched.c
--- linux-2.0.39/kernel/sched.c	Sun Jun 13 19:21:04 1999
+++ linux-2.0.40/kernel/sched.c	Wed Aug 22 13:43:39 2001
@@ -111,7 +111,7 @@
 {
 #ifdef __SMP__
 	int cpu=smp_processor_id();
-#endif	
+#endif
 #if 1	/* sanity tests */
 	if (p->next_run || p->prev_run) {
 		printk("task already on run-queue\n");
@@ -144,7 +144,7 @@
 		int i;
 		for (i=0;i<smp_num_cpus;i++)
 		{
-			if (0==current_set[cpu_logical_map[i]]->pid) 
+			if (0==current_set[cpu_logical_map[i]]->pid)
 			{
 				smp_message_pass(cpu_logical_map[i], MSG_RESCHEDULE, 0L, 0);
 				break;
@@ -241,15 +241,15 @@
 {
 	int weight;
 
-#ifdef __SMP__	
+#ifdef __SMP__
 	/* We are not permitted to run a task someone else is running */
 	if (p->processor != NO_PROC_ID)
 		return -1000;
-#ifdef PAST_2_0		
+#ifdef PAST_2_0
 	/* This process is locked to a processor group */
 	if (p->processor_mask && !(p->processor_mask & (1<<this_cpu))
 		return -1000;
-#endif		
+#endif
 #endif
 
 	/*
@@ -269,7 +269,7 @@
 	 */
 	weight = p->counter;
 	if (weight) {
-			
+
 #ifdef __SMP__
 		/* Give a largish advantage to the same processor...   */
 		/* (this is equivalent to penalizing other processors) */
@@ -425,11 +425,11 @@
 			}
 		default:
 			del_from_runqueue(prev);
-		case TASK_RUNNING:
+		case TASK_RUNNING:;
 	}
 	p = init_task.next_run;
 	sti();
-	
+
 #ifdef __SMP__
 	/*
 	 *	This is safe as we do not permit re-entry of schedule()
@@ -438,7 +438,7 @@
 #define idle_task (task[cpu_number_map[this_cpu]])
 #else
 #define idle_task (&init_task)
-#endif	
+#endif
 
 /*
  * Note! there may appear new tasks on the run-queue during this, as
@@ -464,11 +464,11 @@
 	/*
 	 *	Allocate process to CPU
 	 */
-	 
+
 	 next->processor = this_cpu;
 	 next->last_processor = this_cpu;
-#endif	 
-#ifdef __SMP_PROF__ 
+#endif
+#ifdef __SMP_PROF__
 	/* mark processor running an idle thread */
 	if (0==next->pid)
 		set_bit(this_cpu,&smp_idle_map);
@@ -591,8 +591,8 @@
  */
 static inline int waking_non_zero(struct semaphore *sem)
 {
-	int	ret ;
-	long	flags ;
+	int ret;
+	unsigned long flags;
 
 	get_buzz_lock(&sem->lock) ;
 	save_flags(flags) ;
@@ -695,12 +695,12 @@
 
 void __down(struct semaphore * sem)
 {
-	__do_down(sem,TASK_UNINTERRUPTIBLE) ; 
+	__do_down(sem, TASK_UNINTERRUPTIBLE);
 }
 
 int __down_interruptible(struct semaphore * sem)
 {
-	return(__do_down(sem,TASK_INTERRUPTIBLE)) ; 
+	return (__do_down(sem, TASK_INTERRUPTIBLE));
 }
 
 
@@ -1114,7 +1114,7 @@
 		time_adjust_step = tickadj;
 	     else if (time_adjust < -tickadj)
 		time_adjust_step = -tickadj;
-	     
+
 	    /* Reduce by this step the amount of time left  */
 	    time_adjust -= time_adjust_step;
 	}
@@ -1208,7 +1208,7 @@
 	do_process_times(p, user, system);
 	do_it_virt(p, user);
 	do_it_prof(p, ticks);
-}	
+}
 
 static void update_process_times(unsigned long ticks, unsigned long system)
 {
@@ -1235,9 +1235,9 @@
 	{
 		int i = cpu_logical_map[j];
 		struct task_struct *p;
-		
+
 #ifdef __SMP_PROF__
-		if (test_bit(i,&smp_idle_map)) 
+		if (test_bit(i,&smp_idle_map))
 			smp_idle_count[i]++;
 #endif
 		p = current_set[i];
@@ -1463,13 +1463,13 @@
 	p = find_process_by_pid(pid);
 	if (!p)
 		return -ESRCH;
-			
+
 	if (policy < 0)
 		policy = p->policy;
 	else if (policy != SCHED_FIFO && policy != SCHED_RR &&
 		 policy != SCHED_OTHER)
 		return -EINVAL;
-	
+
 	/*
 	 * Valid priorities for SCHED_FIFO and SCHED_RR are 1..99, valid
 	 * priority for SCHED_OTHER is 0.
@@ -1495,7 +1495,7 @@
 	return 0;
 }
 
-asmlinkage int sys_sched_setscheduler(pid_t pid, int policy, 
+asmlinkage int sys_sched_setscheduler(pid_t pid, int policy,
 				      struct sched_param *param)
 {
 	return setscheduler(pid, policy, param);
@@ -1516,7 +1516,7 @@
 	p = find_process_by_pid(pid);
 	if (!p)
 		return -ESRCH;
-			
+
 	return p->policy;
 }
 
@@ -1588,7 +1588,7 @@
 	if (error)
 		return error;
 
-	/* Values taken from 2.1.38 */	
+	/* Values taken from 2.1.38 */
 	t.tv_sec = 0;
 	t.tv_nsec = 150000;   /* is this right for non-intel architecture too?*/
 	memcpy_tofs(interval, &t, sizeof(struct timespec));
@@ -1597,7 +1597,7 @@
 }
 
 /*
- * change timeval to jiffies, trying to avoid the 
+ * change timeval to jiffies, trying to avoid the
  * most obvious overflows..
  */
 static unsigned long timespectojiffies(struct timespec *value)
@@ -1783,7 +1783,7 @@
 	 *	process right in SMP mode.
 	 */
 	int cpu=smp_processor_id();
-#ifndef __SMP__	
+#ifndef __SMP__
 	current_set[cpu]=&init_task;
 #else
 	init_task.processor=cpu;
diff -u --recursive --new-file linux-2.0.39/lib/vsprintf.c linux-2.0.40/lib/vsprintf.c
--- linux-2.0.39/lib/vsprintf.c	Tue Aug  1 09:02:48 1995
+++ linux-2.0.40/lib/vsprintf.c	Sat Mar  3 16:45:30 2001
@@ -131,7 +131,7 @@
 	return str;
 }
 
-int vsprintf(char *buf, const char *fmt, va_list args)
+int _vsnprintf(char *buf, int n, const char *fmt, va_list args)
 {
 	int len;
 	unsigned long num;
@@ -146,7 +146,7 @@
 				   number of chars for from string */
 	int qualifier;		/* 'h', 'l', or 'L' for integer fields */
 
-	for (str=buf ; *fmt ; ++fmt) {
+	for (str = buf; *fmt && (n == -1 || str - buf < n); ++fmt) {
 		if (*fmt != '%') {
 			*str++ = *fmt;
 			continue;
@@ -220,6 +220,12 @@
 
 			len = strnlen(s, precision);
 
+			if (n != -1 && len >= n - (str - buf)) {
+				len = n - 1 - (str - buf);
+				if (len <= 0) break;
+				if (len < field_width) field_width = len;
+			}
+
 			if (!(flags & LEFT))
 				while (len < field_width--)
 					*str++ = ' ';
@@ -291,6 +297,11 @@
 	}
 	*str = '\0';
 	return str-buf;
+}
+
+int vsprintf(char *buf, const char *fmt, va_list args)
+{
+	return _vsnprintf(buf, -1, fmt, args);
 }
 
 int sprintf(char * buf, const char *fmt, ...)
diff -u --recursive --new-file linux-2.0.39/scripts/checkconfig.pl linux-2.0.40/scripts/checkconfig.pl
--- linux-2.0.39/scripts/checkconfig.pl	Sun Nov 15 19:33:23 1998
+++ linux-2.0.40/scripts/checkconfig.pl	Fri Aug 10 18:16:56 2001
@@ -14,6 +14,7 @@
 
     # Initialize variables.
     my $fInComment   = 0;
+    my $fInString    = 0;
     my $fUseConfig   = 0;
     my $iLinuxConfig = 0;
     my %configList   = ();
@@ -25,12 +26,23 @@
 	m+/\*+o && (s+/\*.*?\*/+ +go, (s+/\*.*$+ +o && ($fInComment = 1)));
 
 	# Pick up definitions.
-	if ( m/^#/o )
+	if ( m/^\s*#/o )
 	{
-	    $iLinuxConfig      = $. if m/^#\s*include\s*<linux\/config\.h>/o;
-	    $configList{uc $1} = 1  if m/^#\s*include\s*<config\/(\S*)\.h>/o;
-	    $configList{$1}    = 1  if m/^#\s*define\s+CONFIG_(\w*)/o;
-	    $configList{$1}    = 1  if m/^#\s*undef\s+CONFIG_(\w*)/o;
+	    $iLinuxConfig      = $. if m/^\s*#\s*include\s*"linux\/config\.h"/o;
+	    $configList{uc $1} = 1  if m/^\s*#\s*include\s*"config\/(\S*)\.h"/o;
+	}
+
+	# Strip strings.
+	$fInString && (s+^.*?"+ +o ? ($fInString = 0) : next);
+	m+"+o && (s+".*?"+ +go, (s+".*$+ +o && ($fInString = 1)));
+
+	# Pick up definitions.
+	if ( m/^\s*#/o )
+	{
+	    $iLinuxConfig      = $. if m/^\s*#\s*include\s*<linux\/config\.h>/o;
+	    $configList{uc $1} = 1  if m/^\s*#\s*include\s*<config\/(\S*)\.h>/o;
+	    $configList{$1}    = 1  if m/^\s*#\s*define\s+CONFIG_(\w*)/o;
+	    $configList{$1}    = 1  if m/^\s*#\s*undef\s+CONFIG_(\w*)/o;
 	}
 
 	# Look for usages.
@@ -47,7 +59,7 @@
 
     # Report superfluous includes.
     if ( $iLinuxConfig && ! $fUseConfig )
-	{ print "$file: $iLinuxConfig: <linux/config.h> not needed.\n"; }
+	{ print "$file: $iLinuxConfig: linux/config.h not needed.\n"; }
 
     close(FILE);
 }
diff -u --recursive --new-file linux-2.0.39/scripts/checkhelp.pl linux-2.0.40/scripts/checkhelp.pl
--- linux-2.0.39/scripts/checkhelp.pl	Thu Jan  1 01:00:00 1970
+++ linux-2.0.40/scripts/checkhelp.pl	Fri Aug 10 18:15:58 2001
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+# checkhelp.pl - finds configuration options that have no
+#                corresponding section in the help file
+#
+# made by Meelis Roos (mroos@tartu.cyber.ee)
+
+# read the help file
+@options=split /\n/, `grep '^CONFIG' Documentation/Configure.help`;
+die "Can't read Documentation/Configure.help\n" if $#options == -1;
+
+#read all the files
+foreach $file (@ARGV)
+{
+	open (FILE, $file) || die "Can't open $file: $!\n";
+	while (<FILE>) {
+		# repeat until no CONFIG_* are left
+		while (/^\s*(bool|tristate|dep_tristate|string|int|hex).*' *(.*)'.*(CONFIG_\w*)/) {
+			$what=$3;
+			$name=$2;
+			s/$3//;
+			@found = grep (/$what$/, @options);
+			if ($#found == -1) {
+				next if $nohelp{$what};
+				print "$name\n$what\n  No help for $what\n\n";
+				$nohelp{$what}=1;
+			}
+		}
+	}
+	close (FILE);
+}
diff -u --recursive --new-file linux-2.0.39/scripts/checkincludes.pl linux-2.0.40/scripts/checkincludes.pl
--- linux-2.0.39/scripts/checkincludes.pl	Thu Jan  1 01:00:00 1970
+++ linux-2.0.40/scripts/checkincludes.pl	Fri Aug 10 18:16:02 2001
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+#
+# checkincludes: Find files included more than once in (other) files.
+# Copyright abandoned, 2000, Niels Kristian Bech Jensen <nkbj@image.dk>.
+
+foreach $file (@ARGV) {
+	open(FILE, $file) or die "Cannot open $file: $!.\n";
+
+	my %includedfiles = ();
+
+	while (<FILE>) {
+		if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
+			++$includedfiles{$1};
+		}
+	}
+	
+	foreach $filename (keys %includedfiles) {
+		if ($includedfiles{$filename} > 1) {
+			print "$file: $filename is included more than once.\n";
+		}
+	}
+
+	close(FILE);
+}
