rpms/kernel-xen/devel xen-modular-devices.patch, NONE, 1.1 kernel-xen.spec, 1.10, 1.11 linux-2.6.12-xen.patch, 1.3, 1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 9 06:57:12 UTC 2005
Author: katzj
Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17661
Modified Files:
kernel-xen.spec linux-2.6.12-xen.patch
Added Files:
xen-modular-devices.patch
Log Message:
* Tue Nov 8 2005 Jeremy Katz <katzj at redhat.com>
- change netfront driver to be modular so that anaconda can find netdev
- resync to current mercurial snapshot for various fixes
- add my patches so that xennet and xenblk can be built as modules
xen-modular-devices.patch:
arch/xen/Kconfig | 4 ++--
arch/xen/kernel/gnttab.c | 1 +
drivers/xen/blkfront/Makefile | 4 +++-
drivers/xen/blkfront/blkfront.c | 1 +
drivers/xen/blkfront/block.h | 1 +
drivers/xen/blkfront/vbd.c | 16 +++++++---------
drivers/xen/netfront/Makefile | 4 +++-
7 files changed, 18 insertions(+), 13 deletions(-)
--- NEW FILE xen-modular-devices.patch ---
diff -r abbe3df33774 linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c Tue Nov 8 22:50:32 2005
@@ -43,6 +43,7 @@
EXPORT_SYMBOL(gnttab_free_grant_reference);
EXPORT_SYMBOL(gnttab_claim_grant_reference);
EXPORT_SYMBOL(gnttab_release_grant_reference);
+EXPORT_SYMBOL(gnttab_request_free_callback);
EXPORT_SYMBOL(gnttab_grant_foreign_access_ref);
EXPORT_SYMBOL(gnttab_grant_foreign_transfer_ref);
diff -r abbe3df33774 linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Tue Nov 8 22:49:53 2005
@@ -641,6 +641,7 @@
info->vdevice = vdevice;
info->connected = BLKIF_STATE_DISCONNECTED;
info->mi = NULL;
+ info->gd = NULL;
INIT_WORK(&info->work, blkif_restart_queue, (void *)info);
info->shadow_free = 0;
diff -r abbe3df33774 linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Tue Nov 8 22:49:53 2005
@@ -116,6 +116,7 @@
/* We watch the backend */
struct xenbus_watch watch;
dev_t dev;
+ struct gendisk *gd;
int vdevice;
blkif_vdev_t handle;
int connected;
diff -r abbe3df33774 linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Tue Nov 8 22:49:53 2005
@@ -259,6 +259,7 @@
gd->flags |= GENHD_FL_CD;
add_disk(gd);
+ info->gd = gd;
return 0;
@@ -292,22 +293,19 @@
xlvbd_del(struct blkfront_info *info)
{
struct block_device *bd;
- struct gendisk *gd;
- int unused;
- request_queue_t *rq;
bd = bdget(info->dev);
if (bd == NULL)
return;
- gd = get_gendisk(info->dev, &unused);
- rq = gd->queue;
-
- del_gendisk(gd);
- put_disk(gd);
+ if (info->gd == NULL)
+ return;
+
+ del_gendisk(info->gd);
+ put_disk(info->gd);
xlbd_put_major_info(info->mi);
info->mi = NULL;
- blk_cleanup_queue(rq);
+ blk_cleanup_queue(info->rq);
bdput(bd);
}
diff -r abbe3df33774 linux-2.6-xen-sparse/arch/xen/Kconfig
--- a/linux-2.6-xen-sparse/arch/xen/Kconfig Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/arch/xen/Kconfig Tue Nov 8 22:52:32 2005
@@ -94,7 +94,7 @@
Say Y if you want this feature.
config XEN_BLKDEV_FRONTEND
- bool "Block-device frontend driver"
+ tristate "Block-device frontend driver"
default y
help
The block-device frontend driver allows the kernel to access block
@@ -103,7 +103,7 @@
(domain 0), then you almost certainly want to say Y here.
config XEN_NETDEV_FRONTEND
- bool "Network-device frontend driver"
+ tristate "Network-device frontend driver"
default y
help
The network-device frontend driver allows the kernel to access
diff -r abbe3df33774 linux-2.6-xen-sparse/drivers/xen/blkfront/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/Makefile Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/Makefile Tue Nov 8 22:52:32 2005
@@ -1,3 +1,5 @@
-obj-y := blkfront.o vbd.o
+obj-$(CONFIG_XEN_BLKDEV_FRONTEND) := xenblk.o
+xenblk-objs := blkfront.o vbd.o
+
diff -r abbe3df33774 linux-2.6-xen-sparse/drivers/xen/netfront/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/Makefile Tue Nov 8 17:39:58 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/Makefile Tue Nov 8 22:52:32 2005
@@ -1,2 +1,4 @@
-obj-y := netfront.o
+obj-$(CONFIG_XEN_NETDEV_FRONTEND) := xennet.o
+
+xennet-objs := netfront.o
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kernel-xen.spec 8 Nov 2005 23:41:40 -0000 1.10
+++ kernel-xen.spec 9 Nov 2005 06:57:04 -0000 1.11
@@ -113,6 +113,7 @@
Patch1000: linux-2.6.12-xen.patch
+Patch1001: xen-modular-devices.patch
Patch2000: linux-2.6.12-bugon-is-assert.patch
@@ -216,12 +217,13 @@
#
%patch1000 -p1
+%patch1001 -p2
#
# BUG_ON is assert() so don't put statements with a sideeffect in it
-%patch2000 -p1
+#patch2000 -p1
# END OF PATCH APPLICATIONS
@@ -527,6 +529,8 @@
%changelog
* Tue Nov 8 2005 Jeremy Katz <katzj at redhat.com>
- change netfront driver to be modular so that anaconda can find netdev
+- resync to current mercurial snapshot for various fixes
+- add my patches so that xennet and xenblk can be built as modules
* Wed Oct 26 2005 Arjan van de Ven <arjanv at redhat.com>
- resync with mercurial xen in the hope to fix some remaining
linux-2.6.12-xen.patch:
linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c | 1
linux-2.6.11-rcu/kernel/rcupdate.c | 5
linux-2.6.12.new/arch/i386/mm/init.c | 2
linux-2.6.12.new/arch/i386/mm/pageattr.c | 2
linux-2.6.12.new/arch/i386/mm/pgtable.c | 40
linux-2.6.12.new/include/asm-i386/pgtable-2level-defs.h | 2
linux-2.6.12.new/include/asm-i386/pgtable-3level-defs.h | 2
linux-2.6.12.post/arch/i386/Kconfig | 13
linux-2.6.12.post/arch/i386/kernel/Makefile | 1
linux-2.6.12.post/arch/i386/kernel/smpalts.c | 85
linux-2.6.12.post/arch/i386/kernel/smpboot.c | 10
linux-2.6.12.post/arch/i386/kernel/vmlinux.lds.S | 7
linux-2.6.12.post/include/asm-i386/atomic.h | 7
linux-2.6.12.post/include/asm-i386/bitops.h | 19
linux-2.6.12.post/include/asm-i386/rwsem.h | 17
linux-2.6.12.post/include/asm-i386/smp_alt.h | 32
linux-2.6.12.post/include/asm-i386/spinlock.h | 41
linux-2.6.12.post/include/asm-i386/system.h | 58
linux-2.6.12/arch/x86_64/kernel/i387.c | 2
linux-2.6.12/include/linux/init.h | 12
net/ipv4/netfilter/ip_nat_proto_tcp.c | 8
net/ipv4/netfilter/ip_nat_proto_udp.c | 12
tmp-linux-2.6-xen.patch/arch/ia64/Kconfig | 29
tmp-linux-2.6-xen.patch/arch/ia64/Makefile | 22
tmp-linux-2.6-xen.patch/arch/ia64/hp/sim/Makefile | 2
tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S | 32
tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S | 4
tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S | 5
tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c | 3
tmp-linux-2.6-xen.patch/arch/ia64/xen-mkbuildtree-post | 2
tmp-linux-2.6-xen.patch/arch/ia64/xen-mkbuildtree-pre | 57
tmp-linux-2.6-xen.patch/arch/ia64/xen/Makefile | 5
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/Makefile | 20
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/README | 2
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/coreMakefile | 24
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/evtchn_ia64.c | 156
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/motherboard.c | 178
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/blkback.c.patch | 33
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/console.c.patch | 11
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/devmem.c.patch | 2
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/gnttab.c.patch | 33
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/privcmd.c.patch | 30
tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/xenia64_init.c | 54
tmp-linux-2.6-xen.patch/arch/ia64/xen/hypercall.S | 323 +
tmp-linux-2.6-xen.patch/arch/ia64/xen/xen_ksyms.c | 12
tmp-linux-2.6-xen.patch/arch/ia64/xen/xenconsole.c | 18
tmp-linux-2.6-xen.patch/arch/ia64/xen/xenentry.S | 850 ++
tmp-linux-2.6-xen.patch/arch/ia64/xen/xenhpski.c | 19
tmp-linux-2.6-xen.patch/arch/ia64/xen/xenivt.S | 2044 ++++++
tmp-linux-2.6-xen.patch/arch/ia64/xen/xenminstate.h | 367 +
tmp-linux-2.6-xen.patch/arch/ia64/xen/xenpal.S | 73
tmp-linux-2.6-xen.patch/arch/ia64/xen/xensetup.S | 33
tmp-linux-2.6-xen.patch/arch/xen/Kconfig | 216
tmp-linux-2.6-xen.patch/arch/xen/Kconfig.debug | 129
tmp-linux-2.6-xen.patch/arch/xen/Kconfig.drivers | 98
tmp-linux-2.6-xen.patch/arch/xen/Kconfig~ | 216
tmp-linux-2.6-xen.patch/arch/xen/Makefile | 95
tmp-linux-2.6-xen.patch/arch/xen/boot/Makefile | 11
tmp-linux-2.6-xen.patch/arch/xen/configs/xen0_defconfig_ia64 | 1257 ++++
tmp-linux-2.6-xen.patch/arch/xen/configs/xen0_defconfig_x86_32 | 1277 ++++
tmp-linux-2.6-xen.patch/arch/xen/configs/xen0_defconfig_x86_64 | 1185 +++
tmp-linux-2.6-xen.patch/arch/xen/configs/xenU_defconfig_x86_32 | 566 +
tmp-linux-2.6-xen.patch/arch/xen/configs/xenU_defconfig_x86_64 | 941 +++
tmp-linux-2.6-xen.patch/arch/xen/configs/xen_defconfig_x86_32 | 2994 ++++++++++
tmp-linux-2.6-xen.patch/arch/xen/configs/xen_defconfig_x86_64 | 2426 ++++++++
tmp-linux-2.6-xen.patch/arch/xen/i386/Kconfig | 960 +++
tmp-linux-2.6-xen.patch/arch/xen/i386/Makefile | 108
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/Makefile | 100
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/acpi/Makefile | 13
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/acpi/boot.c | 924 +++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/apic.c | 83
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/cpu/Makefile | 31
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/cpu/common.c | 652 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/cpu/mtrr/Makefile | 16
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/cpu/mtrr/main.c | 165
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/entry.S | 859 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/head.S | 194
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/i386_ksyms.c | 187
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/init_task.c | 49
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/io_apic.c | 2609 ++++++++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/ioport.c | 125
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/irq.c | 300 +
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/ldt.c | 265
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/microcode.c | 163
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/mpparse.c | 1126 +++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/pci-dma.c | 315 +
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/process.c | 770 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/quirks.c | 49
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/setup.c | 1783 +++++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/signal.c | 665 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/smp.c | 612 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/swiotlb.c | 656 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/time.c | 924 +++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/traps.c | 1041 +++
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/vsyscall-note.S | 32
tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/vsyscall.S | 15
tmp-linux-2.6-xen.patch/arch/xen/i386/mach-default/Makefile | 12
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/Makefile | 24
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/fault.c | 616 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/highmem.c | 99
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/hypervisor.c | 431 +
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/init.c | 779 ++
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/ioremap.c | 470 +
tmp-linux-2.6-xen.patch/arch/xen/i386/mm/pgtable.c | 564 +
tmp-linux-2.6-xen.patch/arch/xen/i386/pci/Makefile | 33
tmp-linux-2.6-xen.patch/arch/xen/i386/pci/i386.c | 304 +
tmp-linux-2.6-xen.patch/arch/xen/i386/pci/irq.c | 1120 +++
tmp-linux-2.6-xen.patch/arch/xen/kernel/Makefile | 18
tmp-linux-2.6-xen.patch/arch/xen/kernel/devmem.c | 157
tmp-linux-2.6-xen.patch/arch/xen/kernel/evtchn.c | 787 ++
tmp-linux-2.6-xen.patch/arch/xen/kernel/fixup.c | 93
tmp-linux-2.6-xen.patch/arch/xen/kernel/gnttab.c | 471 +
tmp-linux-2.6-xen.patch/arch/xen/kernel/gnttab.c~ | 471 +
tmp-linux-2.6-xen.patch/arch/xen/kernel/reboot.c | 419 +
tmp-linux-2.6-xen.patch/arch/xen/kernel/skbuff.c | 140
tmp-linux-2.6-xen.patch/arch/xen/kernel/smp.c | 25
tmp-linux-2.6-xen.patch/arch/xen/kernel/smpboot.c | 419 +
tmp-linux-2.6-xen.patch/arch/xen/kernel/xen_proc.c | 28
tmp-linux-2.6-xen.patch/arch/xen/x86_64/Kconfig | 480 +
tmp-linux-2.6-xen.patch/arch/xen/x86_64/Makefile | 93
tmp-linux-2.6-xen.patch/arch/xen/x86_64/ia32/Makefile | 60
tmp-linux-2.6-xen.patch/arch/xen/x86_64/ia32/ia32entry.S | 629 ++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/ia32/syscall32.c | 153
tmp-linux-2.6-xen.patch/arch/xen/x86_64/ia32/vsyscall-int80.S | 57
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/Makefile | 71
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/acpi/Makefile | 20
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/apic.c | 201
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/e820.c | 676 ++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/early_printk.c | 251
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/entry.S | 1060 +++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/genapic.c | 123
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/genapic_xen.c | 162
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/head.S | 271
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/head64.c | 128
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/io_apic.c | 1991 ++++++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/ioport.c | 57
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/irq.c | 110
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/ldt.c | 273
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/mpparse.c | 963 +++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/pci-nommu.c | 98
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/process.c | 752 ++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/setup.c | 1464 ++++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/setup64.c | 356 +
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/signal.c | 493 +
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/smp.c | 498 +
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/traps.c | 988 +++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/vsyscall.c | 241
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/x8664_ksyms.c | 208
tmp-linux-2.6-xen.patch/arch/xen/x86_64/kernel/xen_entry.S | 41
tmp-linux-2.6-xen.patch/arch/xen/x86_64/mm/Makefile | 31
tmp-linux-2.6-xen.patch/arch/xen/x86_64/mm/fault.c | 593 +
tmp-linux-2.6-xen.patch/arch/xen/x86_64/mm/init.c | 977 +++
tmp-linux-2.6-xen.patch/arch/xen/x86_64/mm/pageattr.c | 382 +
tmp-linux-2.6-xen.patch/arch/xen/x86_64/pci/Makefile | 39
tmp-linux-2.6-xen.patch/arch/xen/x86_64/pci/Makefile-BUS | 22
tmp-linux-2.6-xen.patch/drivers/Makefile | 1
tmp-linux-2.6-xen.patch/drivers/acpi/tables.c | 8
tmp-linux-2.6-xen.patch/drivers/char/mem.c | 6
tmp-linux-2.6-xen.patch/drivers/char/tpm/Kconfig | 19
tmp-linux-2.6-xen.patch/drivers/char/tpm/Kconfig.domU | 30
tmp-linux-2.6-xen.patch/drivers/char/tpm/Makefile | 8
tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm.c | 464 -
tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm.h | 59
tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_atmel.c | 105
tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_nsc.c | 241
tmp-linux-2.6-xen.patch/drivers/char/tpm/tpm_xen.c | 531 +
tmp-linux-2.6-xen.patch/drivers/char/tty_io.c | 23
tmp-linux-2.6-xen.patch/drivers/xen/Makefile | 17
tmp-linux-2.6-xen.patch/drivers/xen/Makefile~ | 17
tmp-linux-2.6-xen.patch/drivers/xen/balloon/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/balloon/balloon.c | 577 +
tmp-linux-2.6-xen.patch/drivers/xen/blkback/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/blkback/blkback.c | 564 +
tmp-linux-2.6-xen.patch/drivers/xen/blkback/common.h | 116
tmp-linux-2.6-xen.patch/drivers/xen/blkback/interface.c | 156
tmp-linux-2.6-xen.patch/drivers/xen/blkback/vbd.c | 107
tmp-linux-2.6-xen.patch/drivers/xen/blkback/xenbus.c | 309 +
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Kconfig | 6
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile | 3
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile~ | 3
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c | 757 ++
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c.orig | 757 ++
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c~ | 775 ++
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h | 160
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h.orig | 160
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h~ | 160
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c | 323 +
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c.orig | 323 +
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c.rej | 42
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c~ | 324 +
tmp-linux-2.6-xen.patch/drivers/xen/blktap/Makefile | 3
tmp-linux-2.6-xen.patch/drivers/xen/blktap/blktap.c | 913 +++
tmp-linux-2.6-xen.patch/drivers/xen/blktap/common.h | 118
tmp-linux-2.6-xen.patch/drivers/xen/blktap/interface.c | 147
tmp-linux-2.6-xen.patch/drivers/xen/blktap/xenbus.c | 236
tmp-linux-2.6-xen.patch/drivers/xen/console/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/console/console.c | 803 ++
tmp-linux-2.6-xen.patch/drivers/xen/console/console.c.orig | 793 ++
tmp-linux-2.6-xen.patch/drivers/xen/console/console.c~ | 792 ++
tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.c | 121
tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.c.orig | 124
tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.c~ | 124
tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.h | 23
tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.h.orig | 14
tmp-linux-2.6-xen.patch/drivers/xen/console/xencons_ring.h~ | 13
tmp-linux-2.6-xen.patch/drivers/xen/evtchn/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/evtchn/evtchn.c | 480 +
tmp-linux-2.6-xen.patch/drivers/xen/netback/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/netback/common.h | 118
tmp-linux-2.6-xen.patch/drivers/xen/netback/interface.c | 307 +
tmp-linux-2.6-xen.patch/drivers/xen/netback/loopback.c | 191
tmp-linux-2.6-xen.patch/drivers/xen/netback/netback.c | 852 ++
tmp-linux-2.6-xen.patch/drivers/xen/netback/xenbus.c | 289
tmp-linux-2.6-xen.patch/drivers/xen/netfront/Kconfig | 6
tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile~ | 2
tmp-linux-2.6-xen.patch/drivers/xen/netfront/netfront.c | 1454 ++++
tmp-linux-2.6-xen.patch/drivers/xen/netfront/netfront.c.orig | 1462 ++++
tmp-linux-2.6-xen.patch/drivers/xen/netfront/netfront.c~ | 1454 ++++
tmp-linux-2.6-xen.patch/drivers/xen/privcmd/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/privcmd/privcmd.c | 274
tmp-linux-2.6-xen.patch/drivers/xen/tpmback/Makefile | 4
tmp-linux-2.6-xen.patch/drivers/xen/tpmback/common.h | 96
tmp-linux-2.6-xen.patch/drivers/xen/tpmback/interface.c | 197
tmp-linux-2.6-xen.patch/drivers/xen/tpmback/tpmback.c | 1112 +++
tmp-linux-2.6-xen.patch/drivers/xen/tpmback/xenbus.c | 296
tmp-linux-2.6-xen.patch/drivers/xen/tpmfront/Makefile | 2
tmp-linux-2.6-xen.patch/drivers/xen/tpmfront/tpmfront.c | 767 ++
tmp-linux-2.6-xen.patch/drivers/xen/tpmfront/tpmfront.c.orig | 758 ++
tmp-linux-2.6-xen.patch/drivers/xen/tpmfront/tpmfront.h | 50
tmp-linux-2.6-xen.patch/drivers/xen/util.c | 75
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/Makefile | 7
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.c | 206
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.c.orig | 245
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.c~ | 233
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_comms.h | 50
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_dev.c | 241
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.c | 798 ++
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.c.orig | 716 ++
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_probe.c~ | 701 ++
tmp-linux-2.6-xen.patch/drivers/xen/xenbus/xenbus_xs.c | 909 +++
tmp-linux-2.6-xen.patch/include/asm-ia64/gcc_intrin.h | 60
tmp-linux-2.6-xen.patch/include/asm-ia64/intel_intrin.h | 68
tmp-linux-2.6-xen.patch/include/asm-ia64/pal.h | 1
tmp-linux-2.6-xen.patch/include/asm-ia64/privop.h | 59
tmp-linux-2.6-xen.patch/include/asm-ia64/processor.h | 1
tmp-linux-2.6-xen.patch/include/asm-ia64/system.h | 4
tmp-linux-2.6-xen.patch/include/asm-ia64/xen/privop.h | 272
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/agp.h | 37
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/bug.h | 16
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/desc.h | 146
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/dma-mapping.h | 156
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/fixmap.h | 168
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/floppy.h | 147
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/highmem.h | 80
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/hw_irq.h | 71
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/hypercall.h | 313 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/hypervisor.h | 192
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/io.h | 436 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/kmap_types.h | 32
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/mach-xen/irq_vectors.h | 125
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h | 40
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/mach-xen/setup_arch_pre.h | 5
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/mmu.h | 21
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/mmu_context.h | 108
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/page.h | 269
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/param.h | 23
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pci.h | 140
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pgalloc.h | 64
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pgtable-2level-defs.h | 21
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pgtable-2level.h | 126
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pgtable-3level-defs.h | 25
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pgtable-3level.h | 207
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/pgtable.h | 487 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/processor.h | 703 ++
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/ptrace.h | 69
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/scatterlist.h | 22
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/segment.h | 99
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/setup.h | 66
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/smp.h | 93
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/spinlock.h | 277
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/swiotlb.h | 42
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/synch_bitops.h | 140
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/system.h | 588 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/tlbflush.h | 102
tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/vga.h | 20
tmp-linux-2.6-xen.patch/include/asm-xen/asm-ia64/fixmap.h | 2
tmp-linux-2.6-xen.patch/include/asm-xen/asm-ia64/hypercall.h | 507 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-ia64/hypervisor.h | 55
tmp-linux-2.6-xen.patch/include/asm-xen/asm-ia64/synch_bitops.h | 61
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/arch_hooks.h | 27
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/bootsetup.h | 42
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/desc.h | 240
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/dma-mapping.h | 1
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/fixmap.h | 114
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/floppy.h | 204
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/hw_irq.h | 138
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/hypercall.h | 320 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/hypervisor.h | 2
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/io.h | 374 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/irq.h | 36
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mach-xen/io_ports.h | 30
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mach-xen/irq_vectors.h | 123
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mach-xen/mach_time.h | 122
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mach-xen/mach_timer.h | 48
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h | 47
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mach-xen/setup_arch_pre.h | 5
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mmu.h | 33
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/mmu_context.h | 132
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/page.h | 253
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/param.h | 22
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/pci.h | 167
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/pgalloc.h | 198
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/pgtable.h | 580 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/processor.h | 486 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/ptrace.h | 124
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/segment.h | 46
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/smp.h | 138
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/synch_bitops.h | 2
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/system.h | 414 +
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/timer.h | 64
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/tlbflush.h | 97
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/vga.h | 20
tmp-linux-2.6-xen.patch/include/asm-xen/asm-x86_64/xor.h | 328 +
tmp-linux-2.6-xen.patch/include/asm-xen/balloon.h | 70
tmp-linux-2.6-xen.patch/include/asm-xen/driver_util.h | 26
tmp-linux-2.6-xen.patch/include/asm-xen/evtchn.h | 147
tmp-linux-2.6-xen.patch/include/asm-xen/foreign_page.h | 40
tmp-linux-2.6-xen.patch/include/asm-xen/gnttab.h | 98
tmp-linux-2.6-xen.patch/include/asm-xen/linux-public/evtchn.h | 98
tmp-linux-2.6-xen.patch/include/asm-xen/linux-public/privcmd.h | 90
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/COPYING | 28
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/acm.h | 197
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/acm_ops.h | 107
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/arch-ia64.h | 308 +
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/arch-x86_32.h | 147
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/arch-x86_64.h | 216
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/dom0_ops.h | 473 +
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/event_channel.h | 190
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/grant_table.h | 295
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/blkif.h | 84
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/console.h | 33
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/ioreq.h | 91
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/netif.h | 103
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/ring.h | 209
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/tpmif.h | 54
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/vmx_vlapic.h | 58
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/vmx_vpic.h | 85
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/io/xs_wire.h | 118
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/memory.h | 60
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/physdev.h | 70
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/sched.h | 60
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/sched_ctl.h | 68
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/trace.h | 84
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/vcpu.h | 64
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/version.h | 52
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/vmx_assist.h | 110
tmp-linux-2.6-xen.patch/include/asm-xen/xen-public/xen.h | 450 +
tmp-linux-2.6-xen.patch/include/asm-xen/xen_proc.h | 23
tmp-linux-2.6-xen.patch/include/asm-xen/xenbus.h | 166
tmp-linux-2.6-xen.patch/include/asm-xen/xenbus.h.orig | 151
tmp-linux-2.6-xen.patch/include/asm-xen/xenbus.h~ | 151
tmp-linux-2.6-xen.patch/include/linux/gfp.h | 6
tmp-linux-2.6-xen.patch/include/linux/highmem.h | 2
tmp-linux-2.6-xen.patch/include/linux/irq.h | 1
tmp-linux-2.6-xen.patch/include/linux/mm.h | 7
tmp-linux-2.6-xen.patch/include/linux/skbuff.h | 4
tmp-linux-2.6-xen.patch/include/linux/tpmfe.h | 33
tmp-linux-2.6-xen.patch/kernel/irq/manage.c | 83
tmp-linux-2.6-xen.patch/mm/highmem.c | 9
tmp-linux-2.6-xen.patch/mm/memory.c | 141
tmp-linux-2.6-xen.patch/mm/mmap.c | 4
tmp-linux-2.6-xen.patch/mm/page_alloc.c | 6
tmp-linux-2.6-xen.patch/net/core/dev.c | 40
tmp-linux-2.6-xen.patch/net/core/skbuff.c | 4
375 files changed, 96623 insertions(+), 590 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6.12-xen.patch
Index: linux-2.6.12-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.12-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.12-xen.patch 26 Oct 2005 15:33:39 -0000 1.3
+++ linux-2.6.12-xen.patch 9 Nov 2005 06:57:04 -0000 1.4
@@ -1,6 +1,6 @@
diff -Nurp ref-linux-2.6/arch/ia64/hp/sim/Makefile tmp-linux-2.6-xen.patch/arch/ia64/hp/sim/Makefile
---- ref-linux-2.6/arch/ia64/hp/sim/Makefile 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/hp/sim/Makefile 2005-10-22 10:11:12.000000000 +0200
+--- ref-linux-2.6/arch/ia64/hp/sim/Makefile 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/hp/sim/Makefile 2005-09-27 15:18:59.000000000 -0400
@@ -14,3 +14,5 @@ obj-$(CONFIG_HP_SIMETH) += simeth.o
obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
obj-$(CONFIG_HP_SIMSERIAL_CONSOLE) += hpsim_console.o
@@ -8,8 +8,8 @@
+obj-$(CONFIG_XEN) += simserial.o
+obj-$(CONFIG_XEN) += hpsim_console.o
diff -Nurp ref-linux-2.6/arch/ia64/Kconfig tmp-linux-2.6-xen.patch/arch/ia64/Kconfig
---- ref-linux-2.6/arch/ia64/Kconfig 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/Kconfig 2005-10-22 10:11:11.000000000 +0200
+--- ref-linux-2.6/arch/ia64/Kconfig 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/Kconfig 2005-10-14 12:59:37.000000000 -0400
@@ -46,6 +46,35 @@ config GENERIC_IOMAP
bool
default y
@@ -47,8 +47,8 @@
bool
default y
diff -Nurp ref-linux-2.6/arch/ia64/kernel/entry.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S
---- ref-linux-2.6/arch/ia64/kernel/entry.S 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S 2005-10-22 10:11:12.000000000 +0200
+--- ref-linux-2.6/arch/ia64/kernel/entry.S 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/entry.S 2005-09-27 15:18:59.000000000 -0400
@@ -181,7 +181,7 @@ END(sys_clone)
* called. The code starting at .map relies on this. The rest of the code
* doesn't care about the interrupt masking status.
@@ -169,8 +169,8 @@
mov ar.unat=r9
br.many b7
diff -Nurp ref-linux-2.6/arch/ia64/kernel/head.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S
---- ref-linux-2.6/arch/ia64/kernel/head.S 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S 2005-10-22 10:11:12.000000000 +0200
+--- ref-linux-2.6/arch/ia64/kernel/head.S 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/head.S 2005-09-27 15:18:59.000000000 -0400
@@ -370,6 +370,10 @@ start_ap:
// This is executed by the bootstrap processor (bsp) only:
@@ -183,8 +183,8 @@
// initialize PAL & SAL emulator:
br.call.sptk.many rp=sys_fw_init
diff -Nurp ref-linux-2.6/arch/ia64/kernel/pal.S tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S
---- ref-linux-2.6/arch/ia64/kernel/pal.S 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S 2005-10-22 10:11:13.000000000 +0200
+--- ref-linux-2.6/arch/ia64/kernel/pal.S 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/pal.S 2005-09-27 15:18:59.000000000 -0400
@@ -16,6 +16,7 @@
#include <asm/processor.h>
@@ -212,8 +212,8 @@
/*
* Make a PAL call using the stacked registers calling convention.
diff -Nurp ref-linux-2.6/arch/ia64/kernel/setup.c tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c
---- ref-linux-2.6/arch/ia64/kernel/setup.c 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c 2005-10-22 10:11:13.000000000 +0200
+--- ref-linux-2.6/arch/ia64/kernel/setup.c 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/kernel/setup.c 2005-09-27 15:18:59.000000000 -0400
@@ -273,6 +273,9 @@ io_port_init (void)
static inline int __init
early_console_setup (char *cmdline)
@@ -225,8 +225,8 @@
{
extern int sn_serial_console_early_setup(void);
diff -Nurp ref-linux-2.6/arch/ia64/Makefile tmp-linux-2.6-xen.patch/arch/ia64/Makefile
---- ref-linux-2.6/arch/ia64/Makefile 2005-06-17 21:48:29.000000000 +0200
-+++ tmp-linux-2.6-xen.patch/arch/ia64/Makefile 2005-10-22 10:11:11.000000000 +0200
+--- ref-linux-2.6/arch/ia64/Makefile 2005-06-17 15:48:29.000000000 -0400
++++ tmp-linux-2.6-xen.patch/arch/ia64/Makefile 2005-10-10 11:56:12.000000000 -0400
@@ -11,6 +11,9 @@
NM := $(CROSS_COMPILE)nm -B
READELF := $(CROSS_COMPILE)readelf
@@ -283,8 +283,8 @@
boot: lib/lib.a vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
diff -Nurp ref-linux-2.6/arch/ia64/xen/drivers/coreMakefile tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/coreMakefile
---- ref-linux-2.6/arch/ia64/xen/drivers/coreMakefile 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/coreMakefile 2005-10-22 10:11:16.000000000 +0200
+--- ref-linux-2.6/arch/ia64/xen/drivers/coreMakefile 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/coreMakefile 2005-10-04 10:56:00.000000000 -0400
@@ -0,0 +1,24 @@
+#
+# Makefile for the linux kernel.
@@ -311,9 +311,9 @@
+obj-$(CONFIG_NET) += skbuff.o # until networking is up on ia64
+endif
diff -Nurp ref-linux-2.6/arch/ia64/xen/drivers/evtchn_ia64.c tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/evtchn_ia64.c
---- ref-linux-2.6/arch/ia64/xen/drivers/evtchn_ia64.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/evtchn_ia64.c 2005-10-22 10:11:16.000000000 +0200
-@@ -0,0 +1,170 @@
+--- ref-linux-2.6/arch/ia64/xen/drivers/evtchn_ia64.c 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/evtchn_ia64.c 2005-11-08 18:52:02.000000000 -0500
+@@ -0,0 +1,156 @@
+/* NOTE: This file split off from evtchn.c because there was
+ some discussion that the mechanism is sufficiently different.
+ It may be possible to merge it back in the future... djm */
@@ -338,6 +338,7 @@
+
+ op.cmd = EVTCHNOP_bind_virq;
+ op.u.bind_virq.virq = virq;
++ op.u.bind_virq.vcpu = 0;
+ if ( HYPERVISOR_event_channel_op(&op) != 0 )
+ BUG();
+
@@ -345,12 +346,6 @@
+ return op.u.bind_virq.port;
+}
+
-+int bind_virq_to_irq(int virq)
-+{
-+ printk("bind_virq_to_irq called... FIXME??\n");
-+ while(1);
-+}
-+
+#if 0
+void notify_remote_via_irq(int virq)
+{
@@ -359,19 +354,6 @@
+}
+#endif
+
-+void unbind_virq_from_evtchn(int virq)
-+{
-+ evtchn_op_t op;
-+
-+ op.cmd = EVTCHNOP_close;
-+// op.u.close.dom = DOMID_SELF;
-+ op.u.close.port = virq_to_evtchn[virq];
-+ if ( HYPERVISOR_event_channel_op(&op) != 0 )
-+ BUG();
-+
-+ virq_to_evtchn[virq] = -1;
-+}
-+
+int bind_evtchn_to_irqhandler(unsigned int evtchn,
+ irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ unsigned long irqflags, const char * devname, void *dev_id)
@@ -382,7 +364,11 @@
+ evtchns[evtchn].handler = handler;
+ evtchns[evtchn].dev_id = dev_id;
+ unmask_evtchn(evtchn);
-+ return 0;
++ //return 0;
++ /* On ia64, there's only one irq vector allocated for all event channels,
++ * so let's just return evtchn as handle for later communication
++ */
++ return evtchn;
+}
+
+void unbind_evtchn_from_irqhandler(unsigned int evtchn, void *dev_id)
@@ -485,8 +471,8 @@
+void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) {}
+int teardown_irq(unsigned int irq, struct irqaction * old) {return 0;}
diff -Nurp ref-linux-2.6/arch/ia64/xen/drivers/Makefile tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/Makefile
---- ref-linux-2.6/arch/ia64/xen/drivers/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/Makefile 2005-10-22 10:11:15.000000000 +0200
+--- ref-linux-2.6/arch/ia64/xen/drivers/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/Makefile 2005-10-04 10:56:00.000000000 -0400
@@ -0,0 +1,20 @@
+
+obj-y += util.o
@@ -509,8 +495,8 @@
+#obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
+
diff -Nurp ref-linux-2.6/arch/ia64/xen/drivers/motherboard.c tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/motherboard.c
---- ref-linux-2.6/arch/ia64/xen/drivers/motherboard.c 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/motherboard.c 2005-10-22 10:11:16.000000000 +0200
+--- ref-linux-2.6/arch/ia64/xen/drivers/motherboard.c 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/motherboard.c 2005-10-04 10:56:00.000000000 -0400
@@ -0,0 +1,178 @@
+/*
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -691,8 +677,8 @@
+ */
+fs_initcall(acpi_motherboard_init);
diff -Nurp ref-linux-2.6/arch/ia64/xen/drivers/patches/blkback.c.patch tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/blkback.c.patch
---- ref-linux-2.6/arch/ia64/xen/drivers/patches/blkback.c.patch 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/blkback.c.patch 2005-10-22 10:11:17.000000000 +0200
+--- ref-linux-2.6/arch/ia64/xen/drivers/patches/blkback.c.patch 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/blkback.c.patch 2005-10-04 10:56:00.000000000 -0400
@@ -0,0 +1,57 @@
+diff -Naur xen/blkback/blkback.c xen.patched/blkback/blkback.c
+--- xen/blkback/blkback.c 2005-09-23 10:54:50.000000000 -0600
@@ -752,13 +738,12 @@
+ pending_cons = 0;
+ pending_prod = MAX_PENDING_REQS;
diff -Nurp ref-linux-2.6/arch/ia64/xen/drivers/patches/console.c.patch tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/console.c.patch
---- ref-linux-2.6/arch/ia64/xen/drivers/patches/console.c.patch 1970-01-01 01:00:00.000000000 +0100
-+++ tmp-linux-2.6-xen.patch/arch/ia64/xen/drivers/patches/console.c.patch 2005-10-22 10:11:17.000000000 +0200
[...36038 lines suppressed...]
+diff -urNpP linux-2.6.12/arch/i386/mm/pgtable.c linux-2.6.12.new/arch/i386/mm/pgtable.c
+--- linux-2.6.12/arch/i386/mm/pgtable.c 2005-06-17 20:48:29.000000000 +0100
++++ linux-2.6.12.new/arch/i386/mm/pgtable.c 2005-07-11 16:32:01.478023726 +0100
+@@ -199,14 +199,14 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
+ {
+ unsigned long flags;
+
+- if (PTRS_PER_PMD == 1)
++ if (!HAVE_SHARED_KERNEL_PMD)
+ spin_lock_irqsave(&pgd_lock, flags);
+
+ memcpy((pgd_t *)pgd + USER_PTRS_PER_PGD,
+ swapper_pg_dir + USER_PTRS_PER_PGD,
+ (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
+
+- if (PTRS_PER_PMD > 1)
++ if (HAVE_SHARED_KERNEL_PMD)
+ return;
+
+ pgd_list_add(pgd);
+@@ -214,11 +214,13 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
+ memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
+ }
+
+-/* never called when PTRS_PER_PMD > 1 */
+ void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+ {
+ unsigned long flags; /* can be called from interrupt context */
+
++ if (HAVE_SHARED_KERNEL_PMD)
++ return;
++
+ spin_lock_irqsave(&pgd_lock, flags);
+ pgd_list_del(pgd);
+ spin_unlock_irqrestore(&pgd_lock, flags);
+@@ -226,12 +228,29 @@ void pgd_dtor(void *pgd, kmem_cache_t *c
+
+ pgd_t *pgd_alloc(struct mm_struct *mm)
+ {
+- int i;
++ int i = 0;
+ pgd_t *pgd = kmem_cache_alloc(pgd_cache, GFP_KERNEL);
+
+ if (PTRS_PER_PMD == 1 || !pgd)
+ return pgd;
+
++ if (!HAVE_SHARED_KERNEL_PMD) {
++ /* alloc and copy kernel pmd */
++ unsigned long flags;
++ pgd_t *copy_pgd = pgd_offset_k(PAGE_OFFSET);
++ pud_t *copy_pud = pud_offset(copy_pgd, PAGE_OFFSET);
++ pmd_t *copy_pmd = pmd_offset(copy_pud, PAGE_OFFSET);
++ pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
++ if (0 == pmd)
++ goto out_oom;
++
++ spin_lock_irqsave(&pgd_lock, flags);
++ memcpy(pmd, copy_pmd, PAGE_SIZE);
++ spin_unlock_irqrestore(&pgd_lock, flags);
++ set_pgd(&pgd[USER_PTRS_PER_PGD], __pgd(1 + __pa(pmd)));
++ }
++
++ /* alloc user pmds */
+ for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
+ pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
+ if (!pmd)
+@@ -252,9 +271,16 @@ void pgd_free(pgd_t *pgd)
+ int i;
+
+ /* in the PAE case user pgd entries are overwritten before usage */
+- if (PTRS_PER_PMD > 1)
+- for (i = 0; i < USER_PTRS_PER_PGD; ++i)
+- kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
++ if (PTRS_PER_PMD > 1) {
++ for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
++ pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1);
++ kmem_cache_free(pmd_cache, pmd);
++ }
++ if (!HAVE_SHARED_KERNEL_PMD) {
++ pmd_t *pmd = (void *)__va(pgd_val(pgd[USER_PTRS_PER_PGD])-1);
++ kmem_cache_free(pmd_cache, pmd);
++ }
++ }
+ /* in the non-PAE case, free_pgtables() clears user pgd entries */
+ kmem_cache_free(pgd_cache, pgd);
+ }
+diff -urNpP linux-2.6.12/include/asm-i386/pgtable-2level-defs.h linux-2.6.12.new/include/asm-i386/pgtable-2level-defs.h
+--- linux-2.6.12/include/asm-i386/pgtable-2level-defs.h 2005-06-17 20:48:29.000000000 +0100
++++ linux-2.6.12.new/include/asm-i386/pgtable-2level-defs.h 2005-07-11 16:28:09.733164251 +0100
+@@ -1,6 +1,8 @@
+ #ifndef _I386_PGTABLE_2LEVEL_DEFS_H
+ #define _I386_PGTABLE_2LEVEL_DEFS_H
+
++#define HAVE_SHARED_KERNEL_PMD 0
++
+ /*
+ * traditional i386 two-level paging structure:
+ */
+diff -urNpP linux-2.6.12/include/asm-i386/pgtable-3level-defs.h linux-2.6.12.new/include/asm-i386/pgtable-3level-defs.h
+--- linux-2.6.12/include/asm-i386/pgtable-3level-defs.h 2005-06-17 20:48:29.000000000 +0100
++++ linux-2.6.12.new/include/asm-i386/pgtable-3level-defs.h 2005-07-11 16:28:09.755164902 +0100
+@@ -1,6 +1,8 @@
+ #ifndef _I386_PGTABLE_3LEVEL_DEFS_H
+ #define _I386_PGTABLE_3LEVEL_DEFS_H
+
++#define HAVE_SHARED_KERNEL_PMD 1
++
+ /*
+ * PGDIR_SHIFT determines what a top-level page table entry can map
+ */
+diff -ur linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+--- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:47:48 +01:00
++++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2005-05-27 11:48:07 +01:00
+@@ -120,6 +120,7 @@
+ * and moreover root might send raw packets.
+ * FIXME: Source route IP option packets --RR */
+ if (hooknum == NF_IP_PRE_ROUTING
++ && skb->ip_summed != CHECKSUM_UNNECESSARY
+ && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
+ skb->ip_summed == CHECKSUM_HW ? skb->csum
+ : skb_checksum(skb, iph->ihl*4, udplen, 0))) {
+
+--- ../xen-unstable.hg/linux-2.6.12-xen0/net/ipv4/netfilter/ip_nat_proto_udp.c 2005-06-17 14:48:29.000000000 -0500
++++ linux-2.6-xen-sparse/net/ipv4/netfilter/ip_nat_proto_udp.c 2005-10-14 15:17:53.000000000 -0500
+@@ -112,11 +112,19 @@ udp_manip_pkt(struct sk_buff **pskb,
+ newport = tuple->dst.u.udp.port;
+ portptr = &hdr->dest;
+ }
+- if (hdr->check) /* 0 is a special case meaning no checksum */
+- hdr->check = ip_nat_cheat_check(~oldip, newip,
++
++ if (hdr->check) { /* 0 is a special case meaning no checksum */
++ if ((*pskb)->proto_csum_blank) {
++ hdr->check = ip_nat_cheat_check(oldip, ~newip,
++ ip_nat_cheat_check(*portptr ^ 0xFFFF,
++ newport, hdr->check));
++ } else {
++ hdr->check = ip_nat_cheat_check(~oldip, newip,
+ ip_nat_cheat_check(*portptr ^ 0xFFFF,
+ newport,
+ hdr->check));
++ }
++ }
+ *portptr = newport;
+ return 1;
+ }
+--- ../xen-unstable.hg/linux-2.6.12-xen0/net/ipv4/netfilter/ip_nat_proto_tcp.c 2005-06-17 14:48:29.000000000 -0500
++++ linux-2.6-xen-sparse/net/ipv4/netfilter/ip_nat_proto_tcp.c 2005-10-14 16:41:20.000000000 -0500
+@@ -127,10 +127,16 @@ tcp_manip_pkt(struct sk_buff **pskb,
+ if (hdrsize < sizeof(*hdr))
+ return 1;
+
+- hdr->check = ip_nat_cheat_check(~oldip, newip,
++ if ((*pskb)->proto_csum_blank) {
++ hdr->check = ip_nat_cheat_check(oldip, ~newip,
++ ip_nat_cheat_check(oldport ^ 0xFFFF,
++ newport, hdr->check));
++ } else {
++ hdr->check = ip_nat_cheat_check(~oldip, newip,
+ ip_nat_cheat_check(oldport ^ 0xFFFF,
+ newport,
+ hdr->check));
++ }
+ return 1;
+ }
+
+diff -ur linux-2.6.12.orig/include/linux/init.h linux-2.6.12/include/linux/init.h
+--- linux-2.6.12.orig/include/linux/init.h 2005-11-01 14:52:28.656025573 +0000
++++ linux-2.6.12/include/linux/init.h 2005-11-01 14:53:28.015791549 +0000
+@@ -229,6 +229,18 @@
+ #define __devexitdata __exitdata
+ #endif
+
++#ifdef CONFIG_HOTPLUG_CPU
++#define __cpuinit
++#define __cpuinitdata
++#define __cpuexit
++#define __cpuexitdata
++#else
++#define __cpuinit __init
++#define __cpuinitdata __initdata
++#define __cpuexit __exit
++#define __cpuexitdata __exitdata
++#endif
++
+ /* Functions marked as __devexit may be discarded at kernel link time, depending
+ on config options. Newer versions of binutils detect references from
+ retained sections to discarded sections and flag an error. Pointers to
+diff -ur linux-2.6.12.orig/arch/x86_64/kernel/i387.c linux-2.6.12/arch/x86_64/kernel/i387.c
+--- linux-2.6.12.orig/arch/x86_64/kernel/i387.c 2005-11-01 15:01:58.932991232 +0000
++++ linux-2.6.12/arch/x86_64/kernel/i387.c 2005-11-01 15:02:09.729312416 +0000
+@@ -42,7 +42,7 @@
+ * Called at bootup to set up the initial FPU state that is later cloned
+ * into all processes.
+ */
+-void __init fpu_init(void)
++void __cpuinit fpu_init(void)
+ {
+ unsigned long oldcr0 = read_cr0();
+ extern void __bad_fxsave_alignment(void);
More information about the fedora-cvs-commits
mailing list