bitkeeper revision 1.1159.1.381 (418abc6aXm_o_cyE21OoXc96m0oi5g)

rename linux-2.6.9-patches to patches/linux-2.6.9

7 files changed, 41 insertions, 196 deletions

diff --git a/.rootkeys b/.rootkeys
index bd87779e78..5ca735df35 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -128,8 +128,6 @@
 3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.27-xen-sparse/mm/swapfile.c
 41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.27-xen-sparse/mm/vmalloc.c
 41505c57WAd5l1rlfCLNSCpx9J13vA linux-2.4.27-xen-sparse/net/core/skbuff.c
-413aa1d0oNP8HXLvfPuMe6cSroUfSA linux-2.6.9-patches/agpgart.patch
-413aa1d0ewvSv-ohnNnQQNGsbPTTNA linux-2.6.9-patches/drm.patch
 40f562372u3A7_kfbYYixPHJJxYUxA linux-2.6.9-xen-sparse/arch/xen/Kconfig
 40f56237utH41NPukqHksuNf29IC9A linux-2.6.9-xen-sparse/arch/xen/Kconfig.drivers
 40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.9-xen-sparse/arch/xen/Makefile
@@ -290,6 +288,9 @@
 413cb3b5eKxnzoodEqaWn2wrPnHWnA netbsd-2.0-xen-sparse/sys/arch/xen/xen/xencons.c
 413cb3b5F56TvQWAmO5TsuzhtzLFPQ netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c
 413cb3b53nyOv1OIeDSsCXhBFDXvJA netbsd-2.0-xen-sparse/sys/nfs/files.nfs
+413aa1d0oNP8HXLvfPuMe6cSroUfSA patches/linux-2.6.9/agpgart.patch
+413aa1d0ewvSv-ohnNnQQNGsbPTTNA patches/linux-2.6.9/drm.patch
+418abc69J3F638vPO9MYoDGeYilxoQ patches/linux-2.6.9/nettel.patch
 40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Make.defs
 3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile
 4124b307nRyK3dhn1hAsvrY76NuV3g tools/check/Makefile
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 625b3699ae..37417f1cae 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -51,7 +51,7 @@ netbsd-*-tools/*
 netbsd-*-xen0/*
 netbsd-*-xenU/*
 netbsd-*.patch
-patches/*
+patches/tmp/*
 pristine-*
 tools/*/build/lib*/*.py
 tools/balloon/balloon
@@ -75,191 +75,5 @@ xen/tools/figlet/figlet
 xen/xen
 xen/xen-syms
 xen/xen.*
-install/boot/System.map-2.6.9-xen0
-install/boot/System.map-2.6.9-xenU
-install/boot/config-2.6.9-xen0
-install/boot/config-2.6.9-xenU
-install/boot/vmlinux-syms-2.6.9-xen0
-install/boot/vmlinux-syms-2.6.9-xenU
-install/boot/vmlinuz-2.6.9-xen0
-install/boot/vmlinuz-2.6.9-xenU
-install/boot/xen-syms
-install/boot/xen.gz
-install/etc/xen/scripts/block-enbd
-install/etc/xen/scripts/block-file
-install/etc/xen/scripts/network
-install/etc/xen/scripts/vif-bridge
-install/etc/xen/xend-config.sxp
-install/etc/xen/xmexample1
-install/etc/xen/xmexample2
-install/lib/modules/2.6.9-xen0/build
-install/lib/modules/2.6.9-xen0/kernel/crypto/crc32c.ko
-install/lib/modules/2.6.9-xen0/kernel/crypto/des.ko
-install/lib/modules/2.6.9-xen0/kernel/crypto/md5.ko
-install/lib/modules/2.6.9-xen0/kernel/crypto/sha1.ko
-install/lib/modules/2.6.9-xen0/kernel/drivers/pcmcia/ds.ko
-install/lib/modules/2.6.9-xen0/kernel/drivers/pcmcia/pcmcia_core.ko
-install/lib/modules/2.6.9-xen0/kernel/drivers/pcmcia/yenta_socket.ko
-install/lib/modules/2.6.9-xen0/kernel/fs/exportfs/exportfs.ko
-install/lib/modules/2.6.9-xen0/kernel/fs/fat/fat.ko
-install/lib/modules/2.6.9-xen0/kernel/fs/msdos/msdos.ko
-install/lib/modules/2.6.9-xen0/kernel/fs/nfsd/nfsd.ko
-install/lib/modules/2.6.9-xen0/kernel/fs/vfat/vfat.ko
-install/lib/modules/2.6.9-xen0/kernel/net/ipv4/netfilter/ip_conntrack.ko
-install/lib/modules/2.6.9-xen0/kernel/net/ipv4/netfilter/ip_conntrack_ftp.ko
-install/lib/modules/2.6.9-xen0/kernel/net/ipv4/netfilter/ip_tables.ko
-install/lib/modules/2.6.9-xen0/modules.alias
-install/lib/modules/2.6.9-xen0/modules.ccwmap
-install/lib/modules/2.6.9-xen0/modules.dep
-install/lib/modules/2.6.9-xen0/modules.ieee1394map
-install/lib/modules/2.6.9-xen0/modules.inputmap
-install/lib/modules/2.6.9-xen0/modules.isapnpmap
-install/lib/modules/2.6.9-xen0/modules.pcimap
-install/lib/modules/2.6.9-xen0/modules.symbols
-install/lib/modules/2.6.9-xen0/modules.usbmap
-install/lib/modules/2.6.9-xen0/source
-install/lib/modules/2.6.9-xenU/build
-install/lib/modules/2.6.9-xenU/kernel/crypto/crc32c.ko
-install/lib/modules/2.6.9-xenU/kernel/crypto/md5.ko
-install/lib/modules/2.6.9-xenU/kernel/drivers/block/loop.ko
-install/lib/modules/2.6.9-xenU/kernel/drivers/block/nbd.ko
-install/lib/modules/2.6.9-xenU/kernel/drivers/scsi/scsi_mod.ko
-install/lib/modules/2.6.9-xenU/kernel/drivers/scsi/sd_mod.ko
-install/lib/modules/2.6.9-xenU/kernel/fs/fat/fat.ko
-install/lib/modules/2.6.9-xenU/kernel/fs/msdos/msdos.ko
-install/lib/modules/2.6.9-xenU/kernel/fs/vfat/vfat.ko
-install/lib/modules/2.6.9-xenU/kernel/lib/libcrc32c.ko
-install/lib/modules/2.6.9-xenU/source
-install/lib/python/xen/__init__.py
-install/lib/python/xen/lowlevel/__init__.py
-install/lib/python/xen/sv/CreateDomain.py
-install/lib/python/xen/sv/Daemon.py
-install/lib/python/xen/sv/DomInfo.py
-install/lib/python/xen/sv/DomList.py
-install/lib/python/xen/sv/GenTabbed.py
-install/lib/python/xen/sv/HTMLBase.py
-install/lib/python/xen/sv/Main.py
-install/lib/python/xen/sv/MigrateDomain.py
-install/lib/python/xen/sv/NodeInfo.py
-install/lib/python/xen/sv/RestoreDomain.py
-install/lib/python/xen/sv/SaveDomain.py
-install/lib/python/xen/sv/TabView.py
-install/lib/python/xen/sv/Wizard.py
-install/lib/python/xen/sv/__init__.py
-install/lib/python/xen/sv/params.py
-install/lib/python/xen/sv/util.py
-install/lib/python/xen/util/Brctl.py
-install/lib/python/xen/util/__init__.py
-install/lib/python/xen/util/console_client.py
-install/lib/python/xen/util/ip.py
-install/lib/python/xen/util/tempfile.py
-install/lib/python/xen/xend/Args.py
-install/lib/python/xen/xend/Blkctl.py
-install/lib/python/xen/xend/EventServer.py
-install/lib/python/xen/xend/EventTypes.py
-install/lib/python/xen/xend/PrettyPrint.py
-install/lib/python/xen/xend/Vifctl.py
-install/lib/python/xen/xend/XendAsynchProtocol.py
-install/lib/python/xen/xend/XendClient.py
-install/lib/python/xen/xend/XendConsole.py
-install/lib/python/xen/xend/XendDB.py
-install/lib/python/xen/xend/XendDmesg.py
-install/lib/python/xen/xend/XendDomain.py
-install/lib/python/xen/xend/XendDomainConfig.py
-install/lib/python/xen/xend/XendDomainInfo.py
-install/lib/python/xen/xend/XendError.py
-install/lib/python/xen/xend/XendLogging.py
-install/lib/python/xen/xend/XendMigrate.py
-install/lib/python/xen/xend/XendNode.py
-install/lib/python/xen/xend/XendProtocol.py
-install/lib/python/xen/xend/XendRoot.py
-install/lib/python/xen/xend/XendVnet.py
-install/lib/python/xen/xend/__init__.py
-install/lib/python/xen/xend/encode.py
-install/lib/python/xen/xend/server/SrvBase.py
-install/lib/python/xen/xend/server/SrvConsole.py
-install/lib/python/xen/xend/server/SrvConsoleDir.py
-install/lib/python/xen/xend/server/SrvDaemon.py
-install/lib/python/xen/xend/server/SrvDeviceDir.py
-install/lib/python/xen/xend/server/SrvDir.py
-install/lib/python/xen/xend/server/SrvDmesg.py
-install/lib/python/xen/xend/server/SrvDomain.py
-install/lib/python/xen/xend/server/SrvDomainDir.py
-install/lib/python/xen/xend/server/SrvEventDir.py
-install/lib/python/xen/xend/server/SrvNode.py
-install/lib/python/xen/xend/server/SrvRoot.py
-install/lib/python/xen/xend/server/SrvServer.py
-install/lib/python/xen/xend/server/SrvVnetDir.py
-install/lib/python/xen/xend/server/SrvXendLog.py
-install/lib/python/xen/xend/server/__init__.py
-install/lib/python/xen/xend/server/blkif.py
-install/lib/python/xen/xend/server/channel.py
-install/lib/python/xen/xend/server/console.py
-install/lib/python/xen/xend/server/controller.py
-install/lib/python/xen/xend/server/domain.py
-install/lib/python/xen/xend/server/messages.py
-install/lib/python/xen/xend/server/netif.py
-install/lib/python/xen/xend/server/params.py
-install/lib/python/xen/xend/sxp.py
-install/lib/python/xen/xm/__init__.py
-install/lib/python/xen/xm/create.py
-install/lib/python/xen/xm/destroy.py
-install/lib/python/xen/xm/help.py
-install/lib/python/xen/xm/main.py
-install/lib/python/xen/xm/migrate.py
-install/lib/python/xen/xm/opts.py
-install/lib/python/xen/xm/shutdown.py
-install/usr/bin/miniterm
-install/usr/bin/xen_cpuperf
-install/usr/bin/xencons
-install/usr/bin/xentrace
-install/usr/bin/xentrace_format
-install/usr/include/xc.h
-install/usr/include/xen/COPYING
-install/usr/include/xen/arch-x86_32.h
-install/usr/include/xen/arch-x86_64.h
-install/usr/include/xen/dom0_ops.h
-install/usr/include/xen/event_channel.h
-install/usr/include/xen/grant_table.h
-install/usr/include/xen/io/blkif.h
-install/usr/include/xen/io/domain_controller.h
-install/usr/include/xen/io/netif.h
-install/usr/include/xen/linux/privcmd.h
-install/usr/include/xen/linux/suspend.h
-install/usr/include/xen/physdev.h
-install/usr/include/xen/sched_ctl.h
-install/usr/include/xen/trace.h
-install/usr/include/xen/xen.h
-install/usr/man/man1/xentrace_format.1
-install/usr/man/man8/xentrace.8
-install/usr/sbin/netfix
-install/usr/sbin/xend
-install/usr/sbin/xensv
-install/usr/sbin/xfrd
-install/usr/sbin/xm
-install/var/xen/sv/Main.rpy
-install/var/xen/sv/images/destroy.png
-install/var/xen/sv/images/finish.png
-install/var/xen/sv/images/left-end-highlight.jpg
-install/var/xen/sv/images/left-end-no-highlight.jpg
-install/var/xen/sv/images/middle-highlight.jpg
-install/var/xen/sv/images/middle-no-highlight.jpg
-install/var/xen/sv/images/next.png
-install/var/xen/sv/images/orb_01.jpg
-install/var/xen/sv/images/orb_02.jpg
-install/var/xen/sv/images/pause.png
-install/var/xen/sv/images/previous.png
-install/var/xen/sv/images/reboot.png
-install/var/xen/sv/images/right-end-highlight.jpg
-install/var/xen/sv/images/right-end-no-highlight.jpg
-install/var/xen/sv/images/seperator-left-highlight.jpg
-install/var/xen/sv/images/seperator-right-highlight.jpg
-install/var/xen/sv/images/seperator.jpg
-install/var/xen/sv/images/shutdown.png
-install/var/xen/sv/images/small-destroy.png
-install/var/xen/sv/images/small-pause.png
-install/var/xen/sv/images/small-unpause.png
-install/var/xen/sv/images/unpause.png
-install/var/xen/sv/images/xen.png
-install/var/xen/sv/inc/script.js
-install/var/xen/sv/inc/style.css
+install/*
+
diff --git a/Makefile b/Makefile
index 98fb85c43d..6ce225a449 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ clean:
 
 # clean, but blow away kernel build tree plus tar balls
 mrproper: clean
-	rm -rf dist patches
+	rm -rf dist patches/tmp
 	for i in $(ALLKERNELS) ; do $(MAKE) -f buildconfigs/$$i delete ; done
 	for i in $(ALLSPARSETREES) ; do $(MAKE) -f buildconfigs/Rules.mk $$i-mrproper ; done
 
diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index 03ca303afb..525d31fda8 100644
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -17,11 +17,11 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
-patches/ebtables.diff:
-	mkdir -p patches
+patches/tmp/ebtables.diff:
+	mkdir -p patches/tmp
 	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
 
-$(LINUX_DIR)/include/linux/autoconf.h: patches/ebtables.diff
+$(LINUX_DIR)/include/linux/autoconf.h: patches/tmp/ebtables.diff
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
 	cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR)
@@ -33,7 +33,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
 	  rm -f Makefile ; mv Mk.tmp Makefile )
 	# add ebtables patch
-	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/ebtables.diff )
+	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
 	# Re-use config from install dir if one exits else use default config
 	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
 	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
diff --git a/linux-2.6.9-patches/agpgart.patch b/patches/linux-2.6.9/agpgart.patch
index aba8b200b1..aba8b200b1 100644
--- a/linux-2.6.9-patches/agpgart.patch
+++ b/patches/linux-2.6.9/agpgart.patch
diff --git a/linux-2.6.9-patches/drm.patch b/patches/linux-2.6.9/drm.patch
index 3412ce6203..3412ce6203 100644
--- a/linux-2.6.9-patches/drm.patch
+++ b/patches/linux-2.6.9/drm.patch
diff --git a/patches/linux-2.6.9/nettel.patch b/patches/linux-2.6.9/nettel.patch
new file mode 100644
index 0000000000..88eac1faf2
--- /dev/null
+++ b/patches/linux-2.6.9/nettel.patch
@@ -0,0 +1,30 @@
+diff -ru linux-2.6.8.1/drivers/mtd/maps/nettel.c linux-2.6.8.1-xen0/drivers/mtd/maps/nettel.c
+--- linux-2.6.8.1/drivers/mtd/maps/nettel.c	2004-10-21 15:59:29.000000000 -0600
++++ linux-2.6.8.1-xen0/drivers/mtd/maps/nettel.c	2004-10-22 09:12:17.000000000 -0600
+@@ -270,7 +270,7 @@
+ 	maxsize = AMD_WINDOW_MAXSIZE;
+ 
+ 	*amdpar = SC520_PAR(SC520_PAR_BOOTCS, amdaddr, maxsize);
+-	__asm__ ("wbinvd");
++	wbinvd();
+ 
+ 	nettel_amd_map.phys = amdaddr;
+ 	nettel_amd_map.virt = (unsigned long)
+@@ -382,7 +382,7 @@
+ 	 */
+ 	intel1addr = intel0addr + intel0size;
+ 	*intel1par = SC520_PAR(intel1cs, intel1addr, maxsize);
+-	__asm__ ("wbinvd");
++	wbinvd();
+ 
+ 	maxsize += intel0size;
+ 
+@@ -408,7 +408,7 @@
+ 	intel1size = intel_mtd->size - intel0size;
+ 	if (intel1size > 0) {
+ 		*intel1par = SC520_PAR(intel1cs, intel1addr, intel1size);
+-		__asm__ ("wbinvd");
++		wbinvd();
+ 	} else {
+ 		*intel1par = 0;
+ 	}