[linuxsh-dev] 2.5.20

[NIIBE Y. <gn...@m1...>]

Changes from mainline included.

2002-06-18  NIIBE Yutaka  <gn...@m1...>

	* include/asm-sh/page.h (clear_user_page, copy_user_page): New API.

	* AGAINST-2.5.20: New file.
	* AGAINST-2.5.19: Removed.
	* Makefile: Version 2.5.20.

	* drivers/cdrom/Config.help, drivers/cdrom/Config.in,
	drivers/cdrom/Makefile, drivers/char/Config.help,
	drivers/char/Makefile, drivers/net/Config.help, fs/nfs/inode.c,
	include/asm-sh/pgtable.h, init/do_mounts.c, mm/memory.c: Incorporate
	changes in 2.5.20.

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.26
diff -u -3 -p -r1.26 Makefile
--- Makefile	18 Jun 2002 02:54:38 -0000	1.26
+++ Makefile	18 Jun 2002 03:34:42 -0000
@@ -1,8 +1,24 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 19
+SUBLEVEL = 20
 EXTRAVERSION =-sh
 
+# We are using a recursive build, so we need to do a little thinking
+# to get the ordering right.
+#
+# Most importantly: sub-Makefiles should only ever modify files in
+# their own directory. If in some directory we have a dependency on
+# a file in another dir (which doesn't happen often, but it's of
+# unavoidable when linking the built-in.o targets which finally
+# turn into vmlinux), we will call a sub make in that other dir, and
+# after that we are sure that everything which is in that other dir
+# is now up to date.
+#
+# The only cases where we need to modify files which have global
+# effects are thus separated out and done before the recursive
+# descending is started. They are now explicitly listed as the
+# prepare rule.
+
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
@@ -62,13 +78,8 @@ all:	do-it-all
 
 ifeq (.config,$(wildcard .config))
 include .config
-ifeq (.hdepend,$(wildcard .hdepend))
 do-it-all:	vmlinux
 else
-CONFIGURATION = depend
-do-it-all:	depend
-endif
-else
 CONFIGURATION = config
 do-it-all:	config
 endif
@@ -172,9 +183,16 @@ $(sort $(vmlinux-objs)): $(SUBDIRS) ;
 # 	Handle descending into subdirectories listed in $(SUBDIRS)
 
 .PHONY: $(SUBDIRS)
-$(SUBDIRS): FORCE include/linux/version.h include/config/MARKER
+$(SUBDIRS): prepare
 	@$(MAKE) -C $@
 
+#	Things we need done before we even start the actual build.
+#	The dependency on .hdepend will in turn take care of
+#	include/asm, include/linux/version etc.
+
+.PHONY: prepare
+prepare: .hdepend include/config/MARKER
+
 # Single targets
 # ---------------------------------------------------------------------------
 
@@ -189,69 +207,70 @@ $(SUBDIRS): FORCE include/linux/version.
 %.o: %.S FORCE
 	@$(MAKE) -C $(@D) $(@F)
 
-# Configuration
-# ---------------------------------------------------------------------------
-
-oldconfig: symlinks
-	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
+# 	FIXME: The asm symlink changes when $(ARCH) changes. That's
+#	hard to detect, but I suppose "make mrproper" is a good idea
+#	before switching between archs anyway.
+
+include/asm:
+	@echo 'Making asm->asm-$(ARCH) symlink'
+	@ln -s asm-$(ARCH) $@
+	@echo 'Making directory include/linux/modules'
+	@mkdir include/linux/modules
 
-xconfig: symlinks
-	@$(MAKE) -C scripts kconfig.tk
-	wish -f scripts/kconfig.tk
-
-menuconfig: include/linux/version.h symlinks
-	@$(MAKE) -C scripts/lxdialog all
-	$(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in
-
-config: symlinks
-	$(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
-
-# make asm->asm-$(ARCH) symlink
-
-symlinks:
-	rm -f include/asm
-	( cd include ; ln -sf asm-$(ARCH) asm)
-	@if [ ! -d include/linux/modules ]; then \
-		mkdir include/linux/modules; \
-	fi
-
-# split autoconf.h into include/linux/config/*
+# 	Split autoconf.h into include/linux/config/*
 
 include/config/MARKER: scripts/split-include include/linux/autoconf.h
 	scripts/split-include include/linux/autoconf.h include/config
 	@ touch include/config/MARKER
 
 # Generate some files
+# ---------------------------------------------------------------------------
 
-$(TOPDIR)/include/linux/version.h: include/linux/version.h
+#	version.h changes when $(KERNELRELEASE) etc change, as defined in
+#	this Makefile
 
-include/linux/version.h: ./Makefile
+include/linux/version.h: Makefile
 	@echo Generating $@
 	@. scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL)
 
-# helpers built in scripts/
+# Helpers built in scripts/
+# ---------------------------------------------------------------------------
 
 scripts/mkdep scripts/split-include : FORCE
 	@$(MAKE) -C scripts
 
-# ---------------------------------------------------------------------------
 # Generate dependencies
+# ---------------------------------------------------------------------------
 
-depend dep: dep-files
+# 	In the same pass, generate module versions, that's why it's
+#	all mixed up here.
 
-dep-files: scripts/mkdep archdep include/linux/version.h
-	scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
+.PHONY: depend dep $(patsubst %,_sfdep_%,$(SUBDIRS))
+
+depend dep: .hdepend
+
+#	.hdepend is missing prerequisites - in fact dependencies need
+#	to be redone basically each time anything changed - since
+#	that's too expensive, we traditionally rely on the user to
+#	run "make dep" manually whenever necessary. In this case,
+#	we make "FORCE" a prequisite, to force redoing the
+#	dependencies. Yeah, that's ugly, and it'll go away soon.
+
+.hdepend: scripts/mkdep include/linux/version.h include/asm \
+	  $(if $(filter dep depend,$(MAKECMDGOALS)),FORCE)
+	scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > $@
 	@$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS))
 ifdef CONFIG_MODVERSIONS
-	$(MAKE) update-modverfile
+	@$(MAKE) include/linux/modversions.h
 endif
+	@$(MAKE) archdep
 
-.PHONY: $(patsubst %,_sfdep_%,$(SUBDIRS))
 $(patsubst %,_sfdep_%,$(SUBDIRS)): FORCE
 	@$(MAKE) -C $(patsubst _sfdep_%, %, $@) fastdep
 
-# update modversions.h, but only if it would change
-update-modverfile:
+# 	Update modversions.h, but only if it would change.
+
+include/linux/modversions.h: FORCE
 	@(echo "#ifndef _LINUX_MODVERSIONS_H";\
 	  echo "#define _LINUX_MODVERSIONS_H"; \
 	  echo "#include <linux/modsetver.h>"; \
@@ -260,13 +279,13 @@ update-modverfile:
 	    if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \
 	  done; \
 	  echo "#endif"; \
-	) > $(TOPDIR)/include/linux/modversions.h.tmp
-	@if [ -r $(TOPDIR)/include/linux/modversions.h ] && cmp -s $(TOPDIR)/include/linux/modversions.h $(TOPDIR)/include/linux/modversions.h.tmp; then \
-		echo $(TOPDIR)/include/linux/modversions.h was not updated; \
-		rm -f $(TOPDIR)/include/linux/modversions.h.tmp; \
+	) > $@.tmp
+	@if [ -r $@ ] && cmp -s $@ $@.tmp; then \
+		echo $@ was not updated; \
+		rm -f $@.tmp; \
 	else \
-		echo $(TOPDIR)/include/linux/modversions.h was updated; \
-		mv -f $(TOPDIR)/include/linux/modversions.h.tmp $(TOPDIR)/include/linux/modversions.h; \
+		echo $@ was updated; \
+		mv -f $@.tmp $@; \
 	fi
 
 # ---------------------------------------------------------------------------
@@ -277,7 +296,7 @@ ifdef CONFIG_MODULES
 #	Build modules
 
 ifdef CONFIG_MODVERSIONS
-MODFLAGS += -DMODVERSIONS -include $(HPATH)/linux/modversions.h
+MODFLAGS += -include $(HPATH)/linux/modversions.h
 endif
 
 .PHONY: modules
@@ -332,6 +351,90 @@ modules modules_install: FORCE
 
 endif # CONFIG_MODULES
 
+# Scripts to check various things for consistency
+# ---------------------------------------------------------------------------
+
+checkconfig:
+	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
+
+checkhelp:
+	find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl
+
+checkincludes:
+	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
+
+# Generate tags for editors
+# ---------------------------------------------------------------------------
+
+TAGS: FORCE
+	{ find include/asm-${ARCH} -name '*.h' -print ; \
+	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
+	find $(SUBDIRS) init -name '*.[ch]' ; } | grep -v SCCS | etags -
+
+# 	Exuberant ctags works better with -I
+tags: FORCE
+	CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
+	ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
+	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
+	find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
+
+# Assorted miscellaneous targets
+# ---------------------------------------------------------------------------
+
+# Documentation targets
+
+sgmldocs psdocs pdfdocs htmldocs:
+	@$(MAKE) -C Documentation/DocBook $@
+
+
+# RPM target
+#
+#	If you do a make spec before packing the tarball you can rpm -ta it
+
+spec:
+	. scripts/mkspec >kernel.spec
+
+#	Build a tar ball, generate an rpm from it and pack the result
+#	There arw two bits of magic here
+#	1) The use of /. to avoid tar packing just the symlink
+#	2) Removing the .dep files as they have source paths in them that
+#	   will become invalid
+
+rpm:	clean spec
+	find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
+	set -e; \
+	cd $(TOPDIR)/.. ; \
+	ln -sf $(TOPDIR) $(KERNELPATH) ; \
+	tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
+	rm $(KERNELPATH) ; \
+	cd $(TOPDIR) ; \
+	. scripts/mkversion > .version ; \
+	rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
+	rm $(TOPDIR)/../$(KERNELPATH).tar.gz
+
+# Targets which don't need .config
+# ===========================================================================
+
+# Kernel configuration
+# ---------------------------------------------------------------------------
+
+.PHONY: oldconfig xconfig menuconfig config
+
+oldconfig:
+	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
+
+xconfig:
+	@$(MAKE) -C scripts kconfig.tk
+	wish -f scripts/kconfig.tk
+
+menuconfig:
+	@$(MAKE) -C scripts/lxdialog all
+	$(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in
+
+config:
+	$(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
+
+
 # Cleaning up
 # ---------------------------------------------------------------------------
 
@@ -409,80 +512,19 @@ distclean: mrproper
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 		-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags
 
-# Assorted miscellaneous targets
-# ---------------------------------------------------------------------------
-
-# Documentation targets
-
-sgmldocs psdocs pdfdocs htmldocs:
-	@$(MAKE) -C Documentation/DocBook $@
-
-
-# RPM target
-#
-#	If you do a make spec before packing the tarball you can rpm -ta it
-
-spec:
-	. scripts/mkspec >kernel.spec
-
-#	Build a tar ball, generate an rpm from it and pack the result
-#	There arw two bits of magic here
-#	1) The use of /. to avoid tar packing just the symlink
-#	2) Removing the .dep files as they have source paths in them that
-#	   will become invalid
-
-rpm:	clean spec
-	find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
-	set -e; \
-	cd $(TOPDIR)/.. ; \
-	ln -sf $(TOPDIR) $(KERNELPATH) ; \
-	tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
-	rm $(KERNELPATH) ; \
-	cd $(TOPDIR) ; \
-	. scripts/mkversion > .version ; \
-	rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
-	rm $(TOPDIR)/../$(KERNELPATH).tar.gz
-
-# Scripts to check various things for consistency
-
-checkconfig:
-	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
-
-checkhelp:
-	find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl
-
-checkincludes:
-	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
-
-# Generate tags for editors
-
-TAGS: FORCE
-	{ find include/asm-${ARCH} -name '*.h' -print ; \
-	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
-	find $(SUBDIRS) init -name '*.[ch]' ; } | grep -v SCCS | etags -
-
-# 	Exuberant ctags works better with -I
-tags: FORCE
-	CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
-	ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
-	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
-	find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
-
-# Make a backup
-# FIXME anybody still using this?
-
-backup: mrproper
-	cd .. && tar cf - linux/ | gzip -9 > backup.gz
-	sync
+# FIXME Should go into a make.lib or something 
+# ===========================================================================
 
-# Make checksums
-# FIXME anybody still using this?
+# read all saved command lines
 
-sums:
-	find . -type f -print | sort | xargs sum > .SUMS
+cmd_files := $(wildcard .*.cmd)
+ifneq ($(cmd_files),)
+  include $(cmd_files)
+endif
 
-# FIXME Should go into a make.lib or something 
-# ---------------------------------------------------------------------------
+# Usage: $(call if_changed_rule,foo)
+# will check if $(cmd_foo) changed, or any of the prequisites changed,
+# and if so will execute $(rule_foo)
 
 if_changed_rule = $(if $(strip $? \
 		               $(filter-out $(cmd_$(1)),$(cmd_$(@F)))\
Index: drivers/cdrom/Config.help
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/cdrom/Config.help,v
retrieving revision 1.1
diff -u -3 -p -r1.1 Config.help
--- drivers/cdrom/Config.help	25 Jan 2002 02:07:59 -0000	1.1
+++ drivers/cdrom/Config.help	18 Jun 2002 03:34:42 -0000
@@ -106,27 +106,6 @@ CONFIG_SBPCD
   The module will be called sbpcd.o.  If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_SBPCD2
-  Say Y here only if you have two CD-ROM controller cards of this type
-  (usually only if you have more than four drives).  You should enter
-  the parameters for the second, third and fourth interface card into
-  <file:drivers/cdrom/sbpcd.h> before compiling the new kernel.  Read
-  the file <file:Documentation/cdrom/sbpcd>.
-
-CONFIG_SBPCD3
-  Say Y here only if you have three CD-ROM controller cards of this
-  type (usually only if you have more than six drives).  You should
-  enter the parameters for the second, third and fourth interface card
-  into <file:include/linux/sbpcd.h> before compiling the new kernel.
-  Read the file <file:Documentation/cdrom/sbpcd>.
-
-CONFIG_SBPCD4
-  Say Y here only if you have four CD-ROM controller cards of this
-  type (usually only if you have more than eight drives).  You should
-  enter the parameters for the second, third and fourth interface card
-  into <file:include/linux/sbpcd.h> before compiling the new kernel.
-  Read the file <file:Documentation/cdrom/sbpcd>.
-
 CONFIG_AZTCD
   This is your driver if you have an Aztech CDA268-01A, Orchid
   CD-3110, Okano or Wearnes CDD110, Conrad TXC, or CyCD-ROM CR520 or
Index: drivers/cdrom/Config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/cdrom/Config.in,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 Config.in
--- drivers/cdrom/Config.in	15 Oct 2001 20:44:57 -0000	1.1.1.1
+++ drivers/cdrom/Config.in	18 Jun 2002 03:34:42 -0000
@@ -4,15 +4,6 @@
 tristate '  Aztech/Orchid/Okano/Wearnes/TXC/CyDROM  CDROM support' CONFIG_AZTCD
 tristate '  Goldstar R420 CDROM support' CONFIG_GSCD
 tristate '  Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support' CONFIG_SBPCD
-if [ "$CONFIG_SBPCD" = "y" ]; then
-   bool '    Matsushita/Panasonic, ... second CDROM controller support' CONFIG_SBPCD2
-   if [ "$CONFIG_SBPCD2" = "y" ]; then
-      bool '    Matsushita/Panasonic, ... third CDROM controller support' CONFIG_SBPCD3
-      if [ "$CONFIG_SBPCD3" = "y" ]; then
-	 bool '    Matsushita/Panasonic, ... fourth CDROM controller support' CONFIG_SBPCD4
-      fi
-   fi
-fi
 tristate '  Mitsumi (standard) [no XA/Multisession] CDROM support' CONFIG_MCD
 if [ "$CONFIG_MCD" != "n" ]; then
    int 'MCD IRQ' CONFIG_MCD_IRQ 11
Index: drivers/cdrom/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/cdrom/Makefile,v
retrieving revision 1.2
diff -u -3 -p -r1.2 Makefile
--- drivers/cdrom/Makefile	18 Jun 2002 02:54:38 -0000	1.2
+++ drivers/cdrom/Makefile	18 Jun 2002 03:34:42 -0000
@@ -34,9 +34,6 @@ obj-$(CONFIG_MCD)		+= mcd.o        cdrom
 obj-$(CONFIG_MCDX)		+= mcdx.o       cdrom.o
 obj-$(CONFIG_OPTCD)		+= optcd.o
 obj-$(CONFIG_SBPCD)		+= sbpcd.o      cdrom.o
-obj-$(CONFIG_SBPCD2)		+= sbpcd2.o     cdrom.o
-obj-$(CONFIG_SBPCD3)		+= sbpcd3.o     cdrom.o
-obj-$(CONFIG_SBPCD4)		+= sbpcd4.o     cdrom.o
 obj-$(CONFIG_SJCD)		+= sjcd.o
 obj-$(CONFIG_CDU535)		+= sonycd535.o
 obj-$(CONFIG_SEGA_GDROM)	+= gdrom.o	cdrom.o
Index: drivers/char/Config.help
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Config.help,v
retrieving revision 1.4
diff -u -3 -p -r1.4 Config.help
--- drivers/char/Config.help	1 May 2002 01:10:47 -0000	1.4
+++ drivers/char/Config.help	18 Jun 2002 03:34:42 -0000
@@ -127,6 +127,10 @@ CONFIG_AGP_I810
   815 and 830m chipset boards for their on-board integrated graphics. This
   is required to do any useful video modes with these boards.
 
+CONFIG_AGP_I460
+  This option gives you AGP GART support for the Intel 460GX chipset
+  for IA64 processors.
+
 CONFIG_AGP_VIA
   This option gives you AGP support for the GLX component of the
   XFree86 4.x on VIA MPV3/Apollo Pro chipsets.
@@ -170,6 +174,10 @@ CONFIG_AGP_ALI
   You should say Y here if you use XFree86 3.3.6 or 4.x and want to
   use GLX or DRI.  If unsure, say N.
 
+CONFIG_AGP_HP_ZX1
+  This option gives you AGP GART support for the HP ZX1 chipset
+  for IA64 processors.
+
 CONFIG_I810_TCO
   Hardware driver for the TCO timer built into the Intel i810 and i815
   chipset family.  The TCO (Total Cost of Ownership) timer is a
@@ -1187,3 +1195,7 @@ CONFIG_977_WATCHDOG
 
   Not sure? It's safe to say N.
 
+CONFIG_HVC_CONSOLE
+  pSeries machines when partitioned support a hypervisor virtual
+  console. This driver allows each pSeries partition to have a console
+  which is accessed via the HMC.
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.10
diff -u -3 -p -r1.10 Makefile
--- drivers/char/Makefile	18 Jun 2002 02:54:38 -0000	1.10
+++ drivers/char/Makefile	18 Jun 2002 03:34:42 -0000
@@ -155,6 +155,7 @@ obj-$(CONFIG_MVME147_SCC) += generic_ser
 obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
 obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
 obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
+obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
 
 obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
 obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
Index: drivers/net/Config.help
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/Config.help,v
retrieving revision 1.4
diff -u -3 -p -r1.4 Config.help
--- drivers/net/Config.help	22 Mar 2002 04:44:46 -0000	1.4
+++ drivers/net/Config.help	18 Jun 2002 03:34:42 -0000
@@ -834,18 +834,23 @@ CONFIG_E1000
   This driver supports Intel(R) PRO/1000 gigabit ethernet family of
   adapters, which includes:
 
-     Controller  Adapter Name                     Board IDs
-     ----------  ------------                     ---------
-     82542       PRO/1000 Gigabit Server Adapter  700262-xxx,
-                                                  717037-xxx
-     82543       PRO/1000 F Server Adapter        738640-xxx,
-                                                  A38888-xxx,
-                                                  A06512-xxx
-     82543       PRO/1000 T Server Adapter        A19845-xxx,
-                                                  A33948-xxx
-     82544       PRO/1000 XT Server Adapter       A51580-xxx
-     82544       PRO/1000 XF Server Adapter       A50484-xxx
-     82544       PRO/1000 T Desktop Adapter       A62947-xxx
+     Controller  Adapter Name                         Board IDs
+     ----------  ------------                         ---------
+     82542       PRO/1000 Gigabit Server Adapter      700262-xxx,
+                                                      717037-xxx
+     82543       PRO/1000 F Server Adapter            738640-xxx,
+                                                      A38888-xxx
+     82543       PRO/1000 T Server Adapter            A19845-xxx,
+                                                      A33948-xxx
+     82544       PRO/1000 XT Server Adapter           A51580-xxx
+     82544       PRO/1000 XF Server Adapter           A50484-xxx
+     82544       PRO/1000 T Desktop Adapter           A62947-xxx
+     82540       PRO/1000 MT Desktop Adapter          A78408-xxx
+     82545       PRO/1000 MT Server Adapter           A92165-xxx
+     82546       PRO/1000 MT Dual Port Server Adapter A92111-xxx
+     82545       PRO/1000 MF Server Adapter           A91622-xxx
+     82545       PRO/1000 MF Server Adapter(LX)       A91624-xxx
+     82546       PRO/1000 MF Dual Port Server Adapter A91620-xxx 
 
   For more information on how to identify your adapter, go to the
   Adapter & Driver ID Guide at:
@@ -1363,6 +1368,80 @@ CONFIG_EEPRO100
   The module will be called eepro100.o.  If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt> as
   well as <file:Documentation/networking/net-modules.txt>.
+
+CONFIG_E100
+  This driver supports Intel(R) PRO/100 family of adapters, which 
+  includes:
+
+     Controller  Adapter Name                       Board IDs
+     ----------  ------------                       ---------
+
+     82558       PRO/100+ PCI Adapter               668081-xxx, 
+                                                    689661-xxx
+     82558       PRO/100+ Management Adapter        691334-xxx, 
+                                                    701738-xxx,
+                                                    721383-xxx
+     82558       PRO/100+ Dual Port Server Adapter  714303-xxx, 
+                                                    711269-xxx, 
+                                                    A28276-xxx
+     82558       PRO/100+ PCI Server Adapter        710550-xxx
+     82550       PRO/100 S Server Adapter           752438-xxx
+     82559                                          A56831-xxx, 
+                                                    A10563-xxx,
+                                                    A12171-xxx, 
+                                                    A12321-xxx, 
+                                                    A12320-xxx, 
+                                                    A12170-xxx
+                                                    748568-xxx
+                                                    748565-xxx
+     82550       PRO/100 S Desktop Adapter          751767-xxx
+     82559                                          748592-xxx, 
+                                                    A12167-xxx, 
+                                                    A12318-xxx, 
+                                                    A12317-xxx, 
+                                                    A12165-xxx,
+                                                    748569-xxx 
+     82559       PRO/100+ Server Adapter            729757-xxx
+     82559       PRO/100 S Management Adapter       748566-xxx, 
+                                                    748564-xxx
+     82550       PRO/100 S Dual Port Server Adapter A56831-xxx
+     82551       PRO/100 M Desktop Adapter          A80897-xxx
+                 PRO/100 S Advanced Management Adapter 
+                                                    747842-xxx, 
+                                                    745171-xxx
+     CNR         PRO/100 VE Desktop Adapter         A10386-xxx, 
+                                                    A10725-xxx, 
+                                                    A23801-xxx, 
+                                                    A19716-xxx
+                 PRO/100 VM Desktop Adapter         A14323-xxx, 
+                                                    A19725-xxx, 
+                                                    A23801-xxx, 
+                                                    A22220-xxx, 
+                                                    A23796-xxx
+   
+
+  To verify that your adapter is supported, find the board ID number 
+  on the adapter. Look for a label that has a barcode and a number 
+  in the format 123456-001 (six digits hyphen three digits). Match 
+  this to the list of numbers above.
+
+  For more information on how to identify your adapter, go to the 
+  Adapter & Driver ID Guide at:
+
+    http://support.intel.com/support/network/adapter/pro100/21397.htm
+
+  For the latest Intel PRO/100 network driver for Linux, see:
+
+    http://appsr.intel.com/scripts-df/support_intel.asp
+
+  More specific information on configuring the driver is in 
+  <file:Documentation/networking/e100.txt>.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called e100.o.  If you want to compile it as a
+  module, say M here and read <file:Documentation/modules.txt> as well
+  as <file:Documentation/networking/net-modules.txt>.
 
 CONFIG_FEALNX
   Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet
Index: fs/nfs/inode.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/fs/nfs/inode.c,v
retrieving revision 1.7
diff -u -3 -p -r1.7 inode.c
--- fs/nfs/inode.c	18 Jun 2002 02:17:19 -0000	1.7
+++ fs/nfs/inode.c	18 Jun 2002 03:34:42 -0000
@@ -801,11 +801,14 @@ int
 nfs_wait_on_inode(struct inode *inode, int flag)
 {
 	struct rpc_clnt	*clnt = NFS_CLIENT(inode);
+	struct nfs_inode *nfsi = NFS_I(inode);
+
 	int error;
 	if (!(NFS_FLAGS(inode) & flag))
 		return 0;
 	atomic_inc(&inode->i_count);
-	error = nfs_wait_event(clnt, inode->i_wait, !(NFS_FLAGS(inode) & flag));
+	error = nfs_wait_event(clnt, nfsi->nfs_i_wait,
+				!(NFS_FLAGS(inode) & flag));
 	iput(inode);
 	return error;
 }
@@ -924,7 +927,7 @@ __nfs_revalidate_inode(struct nfs_server
 	NFS_FLAGS(inode) &= ~NFS_INO_STALE;
 out:
 	NFS_FLAGS(inode) &= ~NFS_INO_REVALIDATING;
-	wake_up(&inode->i_wait);
+	wake_up(&NFS_I(inode)->nfs_i_wait);
  out_nowait:
 	unlock_kernel();
 	return status;
@@ -1260,6 +1263,7 @@ static void init_once(void * foo, kmem_c
 		nfsi->ndirty = 0;
 		nfsi->ncommit = 0;
 		nfsi->npages = 0;
+		init_waitqueue_head(&nfsi->nfs_i_wait);
 	}
 }
  
Index: include/asm-sh/page.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/page.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 page.h
--- include/asm-sh/page.h	22 Mar 2002 03:58:40 -0000	1.2
+++ include/asm-sh/page.h	18 Jun 2002 03:34:42 -0000
@@ -28,11 +28,11 @@ extern void clear_page(void *to);
 extern void copy_page(void *to, void *from);
 
 #if defined(__sh3__)
-#define clear_user_page(page, vaddr)	clear_page(page)
-#define copy_user_page(to, from, vaddr)	copy_page(to, from)
+#define clear_user_page(page, vaddr, pg)	clear_page(page)
+#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
 #elif defined(__SH4__)
-extern void clear_user_page(void *to, unsigned long address);
-extern void copy_user_page(void *to, void *from, unsigned long address);
+extern void clear_user_page(void *to, unsigned long address, struct page *pg);
+extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg);
 extern void __clear_user_page(void *to, void *orig_to);
 extern void __copy_user_page(void *to, void *from, void *orig_to);
 #endif
Index: include/asm-sh/pgtable.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/pgtable.h,v
retrieving revision 1.9
diff -u -3 -p -r1.9 pgtable.h
--- include/asm-sh/pgtable.h	22 May 2002 07:37:02 -0000	1.9
+++ include/asm-sh/pgtable.h	18 Jun 2002 03:34:42 -0000
@@ -230,11 +230,11 @@ extern void update_mmu_cache(struct vm_a
  * NOTE: We should set ZEROs at the position of _PAGE_PRESENT
  *       and _PAGE_PROTNONE bits
  */
-#define SWP_TYPE(x)		((x).val & 0xff)
-#define SWP_OFFSET(x)		((x).val >> 10)
-#define SWP_ENTRY(type, offset)	((swp_entry_t) { (type) | ((offset) << 10) })
-#define pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
-#define swp_entry_to_pte(x)	((pte_t) { (x).val })
+#define __swp_type(x)		((x).val & 0xff)
+#define __swp_offset(x)		((x).val >> 10)
+#define __swp_entry(type, offset) ((swp_entry_t) { (type) | ((offset) << 10) })
+#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
+#define __swp_entry_to_pte(x)	((pte_t) { (x).val })
 
 /*
  * Routines for update of PTE 
@@ -248,8 +248,6 @@ extern void update_mmu_cache(struct vm_a
 
 #endif /* !__ASSEMBLY__ */
 
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-#define PageSkip(page)		(0)
 #define kern_addr_valid(addr)	(1)
 
 #define io_remap_page_range remap_page_range
Index: init/do_mounts.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/init/do_mounts.c,v
retrieving revision 1.7
diff -u -3 -p -r1.7 do_mounts.c
--- init/do_mounts.c	18 Jun 2002 02:54:38 -0000	1.7
+++ init/do_mounts.c	18 Jun 2002 03:34:42 -0000
@@ -366,7 +366,7 @@ static int __init create_dev(char *name,
 	return sys_symlink(path + n + 5, name);
 }
 
-#if defined(BLOCK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
+#if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
 static void __init change_floppy(char *fmt, ...)
 {
 	struct termios termios;
Index: mm/memory.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/mm/memory.c,v
retrieving revision 1.17
diff -u -3 -p -r1.17 memory.c
--- mm/memory.c	18 Jun 2002 02:54:39 -0000	1.17
+++ mm/memory.c	18 Jun 2002 03:34:43 -0000
@@ -50,6 +50,8 @@
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
+#include <linux/swapops.h>
+
 unsigned long max_mapnr;
 unsigned long num_physpages;
 void * high_memory;
@@ -1132,7 +1134,7 @@ void swapin_readahead(swp_entry_t entry)
 	num = valid_swaphandles(entry, &offset);
 	for (i = 0; i < num; offset++, i++) {
 		/* Ok, do the async read-ahead now */
-		new_page = read_swap_cache_async(SWP_ENTRY(SWP_TYPE(entry), offset));
+		new_page = read_swap_cache_async(swp_entry(swp_type(entry), offset));
 		if (!new_page)
 			break;
 		page_cache_release(new_page);