rpms/kernel-xen/devel .cvsignore, 1.2, 1.3 kernel-xen.spec, 1.11, 1.12 linux-2.6.12-xen.patch, 1.4, 1.5 sources, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 9 22:43:11 UTC 2005
Author: katzj
Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26799
Modified Files:
.cvsignore kernel-xen.spec linux-2.6.12-xen.patch sources
Log Message:
* Wed Nov 9 2005 Jeremy Katz <katzj at redhat.com>
- Provide: kernel-drm
- Run new-kernel-pkg on guest kernel install
- resync to current, has my modular driver fixes
- also resync hypervisor to current mercurial snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 21 Oct 2005 17:43:32 -0000 1.2
+++ .cvsignore 9 Nov 2005 22:43:07 -0000 1.3
@@ -1,2 +1 @@
-linux-2.6.12.tar.bz2
-xen-20051021.tar.gz
+xen-20051109.tar.gz
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kernel-xen.spec 9 Nov 2005 06:57:04 -0000 1.11
+++ kernel-xen.spec 9 Nov 2005 22:43:07 -0000 1.12
@@ -92,7 +92,7 @@
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20051021.tar.gz
+Source1: xen-20051109.tar.gz
Source2: Config.mk
Source10: COPYING.modules
@@ -113,9 +113,6 @@
Patch1000: linux-2.6.12-xen.patch
-Patch1001: xen-modular-devices.patch
-
-Patch2000: linux-2.6.12-bugon-is-assert.patch
# END OF PATCH DEFINITIONS
@@ -133,6 +130,7 @@
Group: System Environment/Kernel
Provides: kernel = 2.6.13
+Provides: kernel-drm = 4.3.0
Prereq: %{kernel_prereq}
Requires: xen
Conflicts: %{kernel_dot_org_conflicts}
@@ -170,6 +168,7 @@
Group: System Environment/Kernel
Provides: kernel = 2.6.13
+Provides: kernel-drm = 4.3.0
Prereq: %{kernel_prereq}
Conflicts: %{kernel_dot_org_conflicts}
Conflicts: %{package_conflicts}
@@ -217,7 +216,6 @@
#
%patch1000 -p1
-%patch1001 -p2
#
@@ -474,6 +472,7 @@
%post guest
[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
%post guest-devel
@@ -527,6 +526,12 @@
/usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
%changelog
+* Wed Nov 9 2005 Jeremy Katz <katzj at redhat.com>
+- Provide: kernel-drm
+- Run new-kernel-pkg on guest kernel install
+- resync to current, has my modular driver fixes
+- also resync hypervisor to current mercurial snapshot
+
* 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
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 | 318 +
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 | 659 ++
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 | 455 +
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 | 565 +
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 | 472 +
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 | 142
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 | 5
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile~ | 3
tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c | 758 ++
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 | 161
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 | 321 +
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 | 4
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 | 195
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 | 280
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 | 591 +
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
377 files changed, 97535 insertions(+), 590 deletions(-)
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.12-xen.patch 9 Nov 2005 06:57:04 -0000 1.4
+++ linux-2.6.12-xen.patch 9 Nov 2005 22:43:07 -0000 1.5
@@ -24366,8 +24366,8 @@
+#endif /*CONFIG_ACPI_BOOT*/
diff -Nurp ref-linux-2.6/arch/xen/i386/kernel/pci-dma.c tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/pci-dma.c
--- ref-linux-2.6/arch/xen/i386/kernel/pci-dma.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/pci-dma.c 2005-09-27 15:19:00.000000000 -0400
-@@ -0,0 +1,315 @@
++++ tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/pci-dma.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,318 @@
+/*
+ * Dynamic DMA mapping support.
+ *
@@ -24522,8 +24522,11 @@
+ ret = (void *)vstart;
+
+ if (ret != NULL) {
-+ xen_create_contiguous_region(vstart, order);
-+
++ /* NB. Hardcode 31 address bits for now: aacraid limitation. */
++ if (xen_create_contiguous_region(vstart, order, 31) != 0) {
++ free_pages(vstart, order);
++ return NULL;
++ }
+ memset(ret, 0, size);
+ *dma_handle = virt_to_bus(ret);
+ }
@@ -28584,8 +28587,8 @@
+
diff -Nurp ref-linux-2.6/arch/xen/i386/kernel/swiotlb.c tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/swiotlb.c
--- ref-linux-2.6/arch/xen/i386/kernel/swiotlb.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/swiotlb.c 2005-09-27 15:19:00.000000000 -0400
-@@ -0,0 +1,656 @@
++++ tmp-linux-2.6-xen.patch/arch/xen/i386/kernel/swiotlb.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,659 @@
+/*
+ * Dynamic DMA mapping support.
+ *
@@ -28705,6 +28708,7 @@
+swiotlb_init_with_default_size (size_t default_size)
+{
+ unsigned long i, bytes;
++ int rc;
+
+ if (!iotlb_nslabs) {
+ iotlb_nslabs = (default_size >> IO_TLB_SHIFT);
@@ -28725,8 +28729,10 @@
+ "Use dom0_mem Xen boot parameter to reserve\n"
+ "some DMA memory (e.g., dom0_mem=-128M).\n");
+
-+ xen_create_contiguous_region(
-+ (unsigned long)iotlb_virt_start, get_order(bytes));
++ /* Hardcode 31 address bits for now: aacraid limitation. */
++ rc = xen_create_contiguous_region(
++ (unsigned long)iotlb_virt_start, get_order(bytes), 31);
++ BUG_ON(rc);
+
+ /*
+ * Allocate and initialize the free list array. This array is used
@@ -32123,8 +32129,8 @@
+
diff -Nurp ref-linux-2.6/arch/xen/i386/mm/hypervisor.c tmp-linux-2.6-xen.patch/arch/xen/i386/mm/hypervisor.c
--- ref-linux-2.6/arch/xen/i386/mm/hypervisor.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/i386/mm/hypervisor.c 2005-09-27 15:19:00.000000000 -0400
-@@ -0,0 +1,431 @@
++++ tmp-linux-2.6-xen.patch/arch/xen/i386/mm/hypervisor.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,455 @@
+/******************************************************************************
+ * mm/hypervisor.c
+ *
@@ -32441,7 +32447,8 @@
+}
+
+/* Ensure multi-page extents are contiguous in machine memory. */
-+void xen_create_contiguous_region(unsigned long vstart, unsigned int order)
++int xen_create_contiguous_region(
++ unsigned long vstart, unsigned int order, unsigned int address_bits)
+{
+ pgd_t *pgd;
+ pud_t *pud;
@@ -32476,9 +32483,10 @@
+
+ /* 2. Get a new contiguous memory extent. */
+ reservation.extent_order = order;
-+ reservation.address_bits = 31; /* aacraid limitation */
-+ BUG_ON(HYPERVISOR_memory_op(
-+ XENMEM_increase_reservation, &reservation) != 1);
++ reservation.address_bits = address_bits;
++ if (HYPERVISOR_memory_op(XENMEM_increase_reservation,
++ &reservation) != 1)
++ goto fail;
+
+ /* 3. Map the new extent in place of old pages. */
+ for (i = 0; i < (1<<order); i++) {
@@ -32494,6 +32502,28 @@
+ contiguous_bitmap_set(__pa(vstart) >> PAGE_SHIFT, 1UL << order);
+
+ balloon_unlock(flags);
++
++ return 0;
++
++ fail:
++ reservation.extent_order = 0;
++ reservation.address_bits = 0;
++
++ for (i = 0; i < (1<<order); i++) {
++ BUG_ON(HYPERVISOR_memory_op(
++ XENMEM_increase_reservation, &reservation) != 1);
++ BUG_ON(HYPERVISOR_update_va_mapping(
++ vstart + (i*PAGE_SIZE),
++ pfn_pte_ma(mfn, PAGE_KERNEL), 0));
++ xen_machphys_update(mfn, (__pa(vstart)>>PAGE_SHIFT)+i);
++ phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = mfn;
++ }
++
++ flush_tlb_all();
++
++ balloon_unlock(flags);
++
++ return -ENOMEM;
+}
+
+void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
@@ -33843,8 +33873,8 @@
+clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
diff -Nurp ref-linux-2.6/arch/xen/i386/mm/pgtable.c tmp-linux-2.6-xen.patch/arch/xen/i386/mm/pgtable.c
--- ref-linux-2.6/arch/xen/i386/mm/pgtable.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/i386/mm/pgtable.c 2005-11-08 18:52:02.000000000 -0500
-@@ -0,0 +1,564 @@
++++ tmp-linux-2.6-xen.patch/arch/xen/i386/mm/pgtable.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,565 @@
+/*
+ * linux/arch/i386/mm/pgtable.c
+ */
@@ -34126,8 +34156,9 @@
+ unsigned long flags;
+
+#ifdef CONFIG_X86_PAE
-+ /* this gives us a page below 4GB */
-+ xen_create_contiguous_region((unsigned long)pgd, 0);
++ /* Ensure pgd resides below 4GB. */
++ int rc = xen_create_contiguous_region((unsigned long)pgd, 0, 32);
++ BUG_ON(rc);
+#endif
+
+ if (!HAVE_SHARED_KERNEL_PMD)
@@ -35880,7 +35911,7 @@
+clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
diff -Nurp ref-linux-2.6/arch/xen/Kconfig tmp-linux-2.6-xen.patch/arch/xen/Kconfig
--- ref-linux-2.6/arch/xen/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/Kconfig 2005-11-08 22:55:29.000000000 -0500
++++ tmp-linux-2.6-xen.patch/arch/xen/Kconfig 2005-11-09 17:13:32.000000000 -0500
@@ -0,0 +1,216 @@
+#
+# For a description of the syntax of this configuration file,
@@ -35978,7 +36009,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
@@ -35987,7 +36018,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
@@ -37604,8 +37635,8 @@
+ */
diff -Nurp ref-linux-2.6/arch/xen/kernel/gnttab.c tmp-linux-2.6-xen.patch/arch/xen/kernel/gnttab.c
--- ref-linux-2.6/arch/xen/kernel/gnttab.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/kernel/gnttab.c 2005-11-08 22:55:29.000000000 -0500
-@@ -0,0 +1,471 @@
++++ tmp-linux-2.6-xen.patch/arch/xen/kernel/gnttab.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,472 @@
+/******************************************************************************
+ * gnttab.c
+ *
@@ -37651,6 +37682,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);
+
@@ -38999,8 +39031,8 @@
+ */
diff -Nurp ref-linux-2.6/arch/xen/kernel/skbuff.c tmp-linux-2.6-xen.patch/arch/xen/kernel/skbuff.c
--- ref-linux-2.6/arch/xen/kernel/skbuff.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/arch/xen/kernel/skbuff.c 2005-11-08 18:52:02.000000000 -0500
-@@ -0,0 +1,140 @@
++++ tmp-linux-2.6-xen.patch/arch/xen/kernel/skbuff.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,142 @@
+
+#include <linux/config.h>
+#include <linux/module.h>
@@ -39082,8 +39114,10 @@
+ while (skbuff_order_cachep[order] != cachep)
+ order++;
+
++ /* Do our best to allocate contiguous memory but fall back to IOMMU. */
+ if (order != 0)
-+ xen_create_contiguous_region((unsigned long)buf, order);
++ (void)xen_create_contiguous_region(
++ (unsigned long)buf, order, 0);
+
+ scrub_pages(buf, 1 << order);
+}
@@ -59056,8 +59090,8 @@
+ */
diff -Nurp ref-linux-2.6/drivers/xen/blkfront/blkfront.c tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c
--- ref-linux-2.6/drivers/xen/blkfront/blkfront.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c 2005-11-08 22:55:29.000000000 -0500
-@@ -0,0 +1,757 @@
++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/blkfront.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,758 @@
+/******************************************************************************
+ * blkfront.c
+ *
@@ -59701,6 +59735,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;
@@ -61357,8 +61392,8 @@
+ */
diff -Nurp ref-linux-2.6/drivers/xen/blkfront/block.h tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h
--- ref-linux-2.6/drivers/xen/blkfront/block.h 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h 2005-11-08 22:55:29.000000000 -0500
-@@ -0,0 +1,160 @@
++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/block.h 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,161 @@
+/******************************************************************************
+ * block.h
+ *
@@ -61477,6 +61512,7 @@
+ /* We watch the backend */
+ struct xenbus_watch watch;
+ dev_t dev;
++ struct gendisk *gd;
+ int vdevice;
+ blkif_vdev_t handle;
+ int connected;
@@ -61859,10 +61895,12 @@
+ Block device driver for Xen
diff -Nurp ref-linux-2.6/drivers/xen/blkfront/Makefile tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile
--- ref-linux-2.6/drivers/xen/blkfront/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile 2005-11-08 22:55:29.000000000 -0500
-@@ -0,0 +1,3 @@
++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,5 @@
+
-+obj-y := blkfront.o vbd.o
++obj-$(CONFIG_XEN_BLKDEV_FRONTEND) := xenblk.o
++
++xenblk-objs := blkfront.o vbd.o
+
diff -Nurp ref-linux-2.6/drivers/xen/blkfront/Makefile~ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/Makefile~
--- ref-linux-2.6/drivers/xen/blkfront/Makefile~ 1969-12-31 19:00:00.000000000 -0500
@@ -61873,8 +61911,8 @@
+
diff -Nurp ref-linux-2.6/drivers/xen/blkfront/vbd.c tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c
--- ref-linux-2.6/drivers/xen/blkfront/vbd.c 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c 2005-11-08 22:55:29.000000000 -0500
-@@ -0,0 +1,323 @@
++++ tmp-linux-2.6-xen.patch/drivers/xen/blkfront/vbd.c 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,321 @@
+/******************************************************************************
+ * vbd.c
+ *
@@ -62136,6 +62174,7 @@
+ gd->flags |= GENHD_FL_CD;
+
+ add_disk(gd);
++ info->gd = gd;
+
+ return 0;
+
@@ -62169,22 +62208,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;
++ if (info->gd == NULL)
++ return;
+
-+ del_gendisk(gd);
-+ put_disk(gd);
++ 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);
+}
@@ -69515,10 +69551,12 @@
+ Network driver for Xen
diff -Nurp ref-linux-2.6/drivers/xen/netfront/Makefile tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile
--- ref-linux-2.6/drivers/xen/netfront/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile 2005-11-08 22:55:29.000000000 -0500
-@@ -0,0 +1,2 @@
++++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,4 @@
+
-+obj-y := netfront.o
++obj-$(CONFIG_XEN_NETDEV_FRONTEND) := xennet.o
++
++xennet-objs := netfront.o
diff -Nurp ref-linux-2.6/drivers/xen/netfront/Makefile~ tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile~
--- ref-linux-2.6/drivers/xen/netfront/Makefile~ 1969-12-31 19:00:00.000000000 -0500
+++ tmp-linux-2.6-xen.patch/drivers/xen/netfront/Makefile~ 2005-09-27 15:19:00.000000000 -0400
@@ -83605,8 +83643,8 @@
+ */
diff -Nurp ref-linux-2.6/include/asm-xen/asm-i386/hypervisor.h tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/hypervisor.h
--- ref-linux-2.6/include/asm-xen/asm-i386/hypervisor.h 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/hypervisor.h 2005-10-20 10:45:31.000000000 -0400
-@@ -0,0 +1,192 @@
++++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/hypervisor.h 2005-11-09 17:13:32.000000000 -0500
+@@ -0,0 +1,195 @@
+/******************************************************************************
+ * hypervisor.h
+ *
@@ -83738,8 +83776,11 @@
+#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
+#endif /* linux < 2.6.0 */
+
-+void xen_create_contiguous_region(unsigned long vstart, unsigned int order);
-+void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
++/* Returns zero on success else negative errno. */
++int xen_create_contiguous_region(
++ unsigned long vstart, unsigned int order, unsigned int address_bits);
++void xen_destroy_contiguous_region(
++ unsigned long vstart, unsigned int order);
+
+#include <asm/hypercall.h>
+
@@ -87070,7 +87111,291 @@
+#endif
diff -Nurp ref-linux-2.6/include/asm-xen/asm-i386/spinlock.h tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/spinlock.h
--- ref-linux-2.6/include/asm-xen/asm-i386/spinlock.h 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/spinlock.h 2005-11-08 18:52:03.000000000 -0500
++++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/spinlock.h 2005-11-09 01:08:43.000000000 -0500
+@@ -0,0 +1,280 @@
++#ifndef __ASM_SPINLOCK_H
++#define __ASM_SPINLOCK_H
++
++#include <asm/atomic.h>
++#include <asm/rwlock.h>
++#include <asm/page.h>
++#include <linux/config.h>
++#include <linux/compiler.h>
++
++#ifdef CONFIG_SMP_ALTERNATIVES
++#include <asm/smp_alt.h>
++#endif
++
++asmlinkage int printk(const char * fmt, ...)
++ __attribute__ ((format (printf, 1, 2)));
++
++/*
++ * Your basic SMP spinlocks, allowing only a single CPU anywhere
++ */
++
++typedef struct {
++ volatile unsigned int slock;
++#ifdef CONFIG_DEBUG_SPINLOCK
++ unsigned magic;
++#endif
++#ifdef CONFIG_PREEMPT
++ unsigned int break_lock;
++#endif
++} spinlock_t;
++
++#define SPINLOCK_MAGIC 0xdead4ead
++
++#ifdef CONFIG_DEBUG_SPINLOCK
++#define SPINLOCK_MAGIC_INIT , SPINLOCK_MAGIC
++#else
++#define SPINLOCK_MAGIC_INIT /* */
++#endif
++
++#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 SPINLOCK_MAGIC_INIT }
++
++#define spin_lock_init(x) do { *(x) = SPIN_LOCK_UNLOCKED; } while(0)
++
++/*
++ * Simple spin lock operations. There are two variants, one clears IRQ's
++ * on the local processor, one does not.
++ *
++ * We make no fairness assumptions. They have a cost.
++ */
++
++#define spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0)
++#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x))
++
++#define spin_lock_string \
++ "1:\n" \
++ LOCK \
++ "decb %0\n\t" \
++ "jns 3f\n" \
++ "2:\t" \
++ "rep;nop\n\t" \
++ "cmpb $0,%0\n\t" \
++ "jle 2b\n\t" \
++ "jmp 1b\n" \
++ "3:\n\t"
++
++#define spin_lock_string_flags \
++ "1:\n" \
++ LOCK \
++ "decb %0\n\t" \
++ "jns 4f\n\t" \
++ "2:\t" \
++ "testl $0x200, %1\n\t" \
++ "jz 3f\n\t" \
++ "#sti\n\t" \
++ "3:\t" \
++ "rep;nop\n\t" \
++ "cmpb $0, %0\n\t" \
++ "jle 3b\n\t" \
++ "#cli\n\t" \
++ "jmp 1b\n" \
++ "4:\n\t"
++
++/*
++ * This works. Despite all the confusion.
++ * (except on PPro SMP or if we are using OOSTORE)
++ * (PPro errata 66, 92)
++ */
++
++#if !defined(CONFIG_X86_OOSTORE) && !defined(CONFIG_X86_PPRO_FENCE)
++
++#define spin_unlock_string \
++ "movb $1,%0" \
++ :"=m" (lock->slock) : : "memory"
++
++
++static inline void _raw_spin_unlock(spinlock_t *lock)
++{
++#ifdef CONFIG_DEBUG_SPINLOCK
++ BUG_ON(lock->magic != SPINLOCK_MAGIC);
++ BUG_ON(!spin_is_locked(lock));
++#endif
++ __asm__ __volatile__(
++ spin_unlock_string
++ );
++}
++
++#else
++
++#define spin_unlock_string \
++ "xchgb %b0, %1" \
++ :"=q" (oldval), "=m" (lock->slock) \
++ :"0" (oldval) : "memory"
++
++static inline void _raw_spin_unlock(spinlock_t *lock)
++{
++ char oldval = 1;
++#ifdef CONFIG_DEBUG_SPINLOCK
++ BUG_ON(lock->magic != SPINLOCK_MAGIC);
++ BUG_ON(!spin_is_locked(lock));
++#endif
++ __asm__ __volatile__(
++ spin_unlock_string
++ );
++}
++
++#endif
++
++static inline int _raw_spin_trylock(spinlock_t *lock)
++{
++ char oldval;
++#ifdef CONFIG_SMP_ALTERNATIVES
++ __asm__ __volatile__(
++ "1:movb %1,%b0\n"
++ "movb $0,%1\n"
++ "2:"
++ ".section __smp_alternatives,\"a\"\n"
++ ".long 1b\n"
++ ".long 3f\n"
++ ".previous\n"
++ ".section __smp_replacements,\"a\"\n"
++ "3: .byte 2b - 1b\n"
++ ".byte 5f-4f\n"
++ ".byte 0\n"
++ ".byte 6f-5f\n"
++ ".byte -1\n"
++ "4: xchgb %b0,%1\n"
++ "5: movb %1,%b0\n"
++ "movb $0,%1\n"
++ "6:\n"
++ ".previous\n"
++ :"=q" (oldval), "=m" (lock->slock)
++ :"0" (0) : "memory");
++#else
++ __asm__ __volatile__(
++ "xchgb %b0,%1\n"
++ :"=q" (oldval), "=m" (lock->slock)
++ :"0" (0) : "memory");
++#endif
++ return oldval > 0;
++}
++
++static inline void _raw_spin_lock(spinlock_t *lock)
++{
++#ifdef CONFIG_DEBUG_SPINLOCK
++ if (unlikely(lock->magic != SPINLOCK_MAGIC)) {
++ printk("eip: %p\n", __builtin_return_address(0));
++ BUG();
++ }
++#endif
++ __asm__ __volatile__(
++ spin_lock_string
++ :"=m" (lock->slock) : : "memory");
++}
++
++static inline void _raw_spin_lock_flags (spinlock_t *lock, unsigned long flags)
++{
++#ifdef CONFIG_DEBUG_SPINLOCK
++ if (unlikely(lock->magic != SPINLOCK_MAGIC)) {
++ printk("eip: %p\n", __builtin_return_address(0));
++ BUG();
++ }
++#endif
++ __asm__ __volatile__(
++ spin_lock_string_flags
++ :"=m" (lock->slock) : "r" (flags) : "memory");
++}
++
++/*
++ * Read-write spinlocks, allowing multiple readers
++ * but only one writer.
++ *
++ * NOTE! it is quite common to have readers in interrupts
++ * but no interrupt writers. For those circumstances we
++ * can "mix" irq-safe locks - any writer needs to get a
++ * irq-safe write-lock, but readers can get non-irqsafe
++ * read-locks.
++ */
++typedef struct {
++ volatile unsigned int lock;
++#ifdef CONFIG_DEBUG_SPINLOCK
++ unsigned magic;
++#endif
++#ifdef CONFIG_PREEMPT
++ unsigned int break_lock;
++#endif
++} rwlock_t;
++
++#define RWLOCK_MAGIC 0xdeaf1eed
++
++#ifdef CONFIG_DEBUG_SPINLOCK
++#define RWLOCK_MAGIC_INIT , RWLOCK_MAGIC
++#else
++#define RWLOCK_MAGIC_INIT /* */
++#endif
++
++#define RW_LOCK_UNLOCKED (rwlock_t) { RW_LOCK_BIAS RWLOCK_MAGIC_INIT }
++
++#define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0)
++
++/**
++ * read_can_lock - would read_trylock() succeed?
++ * @lock: the rwlock in question.
++ */
++#define read_can_lock(x) ((int)(x)->lock > 0)
++
++/**
++ * write_can_lock - would write_trylock() succeed?
++ * @lock: the rwlock in question.
++ */
++#define write_can_lock(x) ((x)->lock == RW_LOCK_BIAS)
++
++/*
++ * On x86, we implement read-write locks as a 32-bit counter
++ * with the high bit (sign) being the "contended" bit.
++ *
++ * The inline assembly is non-obvious. Think about it.
++ *
++ * Changed to use the same technique as rw semaphores. See
++ * semaphore.h for details. -ben
++ */
++/* the spinlock helpers are in arch/i386/kernel/semaphore.c */
++
++static inline void _raw_read_lock(rwlock_t *rw)
++{
++#ifdef CONFIG_DEBUG_SPINLOCK
++ BUG_ON(rw->magic != RWLOCK_MAGIC);
++#endif
++ __build_read_lock(rw, "__read_lock_failed");
++}
++
++static inline void _raw_write_lock(rwlock_t *rw)
++{
++#ifdef CONFIG_DEBUG_SPINLOCK
++ BUG_ON(rw->magic != RWLOCK_MAGIC);
++#endif
++ __build_write_lock(rw, "__write_lock_failed");
++}
++
++#define _raw_read_unlock(rw) asm volatile(LOCK "incl %0" :"=m" ((rw)->lock) : : "memory")
++#define _raw_write_unlock(rw) asm volatile(LOCK "addl $" RW_LOCK_BIAS_STR ",%0":"=m" ((rw)->lock) : : "memory")
++
++static inline int _raw_read_trylock(rwlock_t *lock)
++{
++ atomic_t *count = (atomic_t *)lock;
++ atomic_dec(count);
++ if (atomic_read(count) >= 0)
++ return 1;
++ atomic_inc(count);
++ return 0;
++}
++
++static inline int _raw_write_trylock(rwlock_t *lock)
++{
++ atomic_t *count = (atomic_t *)lock;
++ if (atomic_sub_and_test(RW_LOCK_BIAS, count))
++ return 1;
++ atomic_add(RW_LOCK_BIAS, count);
++ return 0;
++}
++
++#endif /* __ASM_SPINLOCK_H */
+diff -Nurp ref-linux-2.6/include/asm-xen/asm-i386/spinlock.h~ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/spinlock.h~
+--- ref-linux-2.6/include/asm-xen/asm-i386/spinlock.h~ 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/spinlock.h~ 2005-11-08 18:52:03.000000000 -0500
@@ -0,0 +1,277 @@
+#ifndef __ASM_SPINLOCK_H
+#define __ASM_SPINLOCK_H
@@ -87541,7 +87866,602 @@
+#endif /* __XEN_SYNCH_BITOPS_H__ */
diff -Nurp ref-linux-2.6/include/asm-xen/asm-i386/system.h tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/system.h
--- ref-linux-2.6/include/asm-xen/asm-i386/system.h 1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/system.h 2005-10-20 10:45:31.000000000 -0400
++++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/system.h 2005-11-09 01:09:05.000000000 -0500
+@@ -0,0 +1,591 @@
++#ifndef __ASM_SYSTEM_H
++#define __ASM_SYSTEM_H
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/bitops.h>
++#include <asm/synch_bitops.h>
++#include <asm/segment.h>
++#include <asm/cpufeature.h>
++#include <asm/hypervisor.h>
++
++#ifdef CONFIG_SMP_ALTERNATIVES
++#include <asm/smp_alt.h>
++#endif
++
++#ifdef __KERNEL__
++
++struct task_struct; /* one of the stranger aspects of C forward declarations.. */
++extern struct task_struct * FASTCALL(__switch_to(struct task_struct *prev, struct task_struct *next));
++
++#define switch_to(prev,next,last) do { \
++ unsigned long esi,edi; \
++ asm volatile("pushfl\n\t" \
++ "pushl %%ebp\n\t" \
++ "movl %%esp,%0\n\t" /* save ESP */ \
++ "movl %5,%%esp\n\t" /* restore ESP */ \
++ "movl $1f,%1\n\t" /* save EIP */ \
++ "pushl %6\n\t" /* restore EIP */ \
++ "jmp __switch_to\n" \
++ "1:\t" \
++ "popl %%ebp\n\t" \
++ "popfl" \
++ :"=m" (prev->thread.esp),"=m" (prev->thread.eip), \
++ "=a" (last),"=S" (esi),"=D" (edi) \
++ :"m" (next->thread.esp),"m" (next->thread.eip), \
++ "2" (prev), "d" (next)); \
++} while (0)
++
++#define _set_base(addr,base) do { unsigned long __pr; \
++__asm__ __volatile__ ("movw %%dx,%1\n\t" \
++ "rorl $16,%%edx\n\t" \
++ "movb %%dl,%2\n\t" \
++ "movb %%dh,%3" \
++ :"=&d" (__pr) \
++ :"m" (*((addr)+2)), \
++ "m" (*((addr)+4)), \
++ "m" (*((addr)+7)), \
++ "0" (base) \
++ ); } while(0)
++
++#define _set_limit(addr,limit) do { unsigned long __lr; \
++__asm__ __volatile__ ("movw %%dx,%1\n\t" \
++ "rorl $16,%%edx\n\t" \
++ "movb %2,%%dh\n\t" \
++ "andb $0xf0,%%dh\n\t" \
++ "orb %%dh,%%dl\n\t" \
++ "movb %%dl,%2" \
++ :"=&d" (__lr) \
++ :"m" (*(addr)), \
++ "m" (*((addr)+6)), \
++ "0" (limit) \
++ ); } while(0)
++
++#define set_base(ldt,base) _set_base( ((char *)&(ldt)) , (base) )
++#define set_limit(ldt,limit) _set_limit( ((char *)&(ldt)) , ((limit)-1)>>12 )
++
++static inline unsigned long _get_base(char * addr)
++{
++ unsigned long __base;
++ __asm__("movb %3,%%dh\n\t"
++ "movb %2,%%dl\n\t"
++ "shll $16,%%edx\n\t"
++ "movw %1,%%dx"
++ :"=&d" (__base)
++ :"m" (*((addr)+2)),
++ "m" (*((addr)+4)),
++ "m" (*((addr)+7)));
++ return __base;
++}
++
++#define get_base(ldt) _get_base( ((char *)&(ldt)) )
++
++/*
++ * Load a segment. Fall back on loading the zero
++ * segment if something goes wrong..
++ */
++#define loadsegment(seg,value) \
++ asm volatile("\n" \
++ "1:\t" \
++ "mov %0,%%" #seg "\n" \
++ "2:\n" \
++ ".section .fixup,\"ax\"\n" \
++ "3:\t" \
++ "pushl $0\n\t" \
++ "popl %%" #seg "\n\t" \
++ "jmp 2b\n" \
++ ".previous\n" \
++ ".section __ex_table,\"a\"\n\t" \
++ ".align 4\n\t" \
++ ".long 1b,3b\n" \
++ ".previous" \
++ : :"m" (value))
++
++/*
++ * Save a segment register away
++ */
++#define savesegment(seg, value) \
++ asm volatile("mov %%" #seg ",%0":"=m" (value))
++
++/*
++ * Clear and set 'TS' bit respectively
++ */
++#define clts() (HYPERVISOR_fpu_taskswitch(0))
++#define read_cr0() ({ \
++ unsigned int __dummy; \
++ __asm__( \
++ "movl %%cr0,%0\n\t" \
++ :"=r" (__dummy)); \
++ __dummy; \
++})
++#define write_cr0(x) \
++ __asm__("movl %0,%%cr0": :"r" (x));
++
++#define read_cr4() ({ \
++ unsigned int __dummy; \
++ __asm__( \
++ "movl %%cr4,%0\n\t" \
++ :"=r" (__dummy)); \
++ __dummy; \
++})
++#define write_cr4(x) \
++ __asm__("movl %0,%%cr4": :"r" (x));
++#define stts() (HYPERVISOR_fpu_taskswitch(1))
++
++#endif /* __KERNEL__ */
++
++#define wbinvd() \
++ __asm__ __volatile__ ("wbinvd": : :"memory");
++
++static inline unsigned long get_limit(unsigned long segment)
++{
++ unsigned long __limit;
++ __asm__("lsll %1,%0"
++ :"=r" (__limit):"r" (segment));
++ return __limit+1;
++}
++
++#define nop() __asm__ __volatile__ ("nop")
++
++#define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr))))
++
++#define tas(ptr) (xchg((ptr),1))
++
++struct __xchg_dummy { unsigned long a[100]; };
++#define __xg(x) ((struct __xchg_dummy *)(x))
++
++
++/*
++ * The semantics of XCHGCMP8B are a bit strange, this is why
++ * there is a loop and the loading of %%eax and %%edx has to
++ * be inside. This inlines well in most cases, the cached
++ * cost is around ~38 cycles. (in the future we might want
++ * to do an SIMD/3DNOW!/MMX/FPU 64-bit store here, but that
++ * might have an implicit FPU-save as a cost, so it's not
++ * clear which path to go.)
++ *
++ * cmpxchg8b must be used with the lock prefix here to allow
++ * the instruction to be executed atomically, see page 3-102
++ * of the instruction set reference 24319102.pdf. We need
++ * the reader side to see the coherent 64bit value.
++ */
++static inline void __set_64bit (unsigned long long * ptr,
++ unsigned int low, unsigned int high)
++{
++ __asm__ __volatile__ (
++ "\n1:\t"
++ "movl (%0), %%eax\n\t"
++ "movl 4(%0), %%edx\n\t"
++ "lock cmpxchg8b (%0)\n\t"
++ "jnz 1b"
++ : /* no outputs */
++ : "D"(ptr),
++ "b"(low),
++ "c"(high)
++ : "ax","dx","memory");
++}
++
++static inline void __set_64bit_constant (unsigned long long *ptr,
++ unsigned long long value)
++{
++ __set_64bit(ptr,(unsigned int)(value), (unsigned int)((value)>>32ULL));
++}
++#define ll_low(x) *(((unsigned int*)&(x))+0)
++#define ll_high(x) *(((unsigned int*)&(x))+1)
++
++static inline void __set_64bit_var (unsigned long long *ptr,
++ unsigned long long value)
++{
++ __set_64bit(ptr,ll_low(value), ll_high(value));
++}
++
++#define set_64bit(ptr,value) \
++(__builtin_constant_p(value) ? \
++ __set_64bit_constant(ptr, value) : \
++ __set_64bit_var(ptr, value) )
++
++#define _set_64bit(ptr,value) \
++(__builtin_constant_p(value) ? \
++ __set_64bit(ptr, (unsigned int)(value), (unsigned int)((value)>>32ULL) ) : \
++ __set_64bit(ptr, ll_low(value), ll_high(value)) )
++
++/*
++ * Note: no "lock" prefix even on SMP: xchg always implies lock anyway
++ * Note 2: xchg has side effect, so that attribute volatile is necessary,
++ * but generally the primitive is invalid, *ptr is output argument. --ANK
++ */
++static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
++{
++ switch (size) {
++ case 1:
++ __asm__ __volatile__("xchgb %b0,%1"
++ :"=q" (x)
++ :"m" (*__xg(ptr)), "0" (x)
++ :"memory");
++ break;
++ case 2:
++ __asm__ __volatile__("xchgw %w0,%1"
++ :"=r" (x)
++ :"m" (*__xg(ptr)), "0" (x)
++ :"memory");
++ break;
++ case 4:
++ __asm__ __volatile__("xchgl %0,%1"
++ :"=r" (x)
++ :"m" (*__xg(ptr)), "0" (x)
++ :"memory");
++ break;
++ }
++ return x;
++}
++
++/*
++ * Atomic compare and exchange. Compare OLD with MEM, if identical,
++ * store NEW in MEM. Return the initial value in MEM. Success is
++ * indicated by comparing RETURN with OLD.
++ */
++
++#ifdef CONFIG_X86_CMPXCHG
++#define __HAVE_ARCH_CMPXCHG 1
++#endif
++
++static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
++ unsigned long new, int size)
++{
++ unsigned long prev;
++ switch (size) {
++ case 1:
++ __asm__ __volatile__(LOCK "cmpxchgb %b1,%2"
++ : "=a"(prev)
++ : "q"(new), "m"(*__xg(ptr)), "0"(old)
++ : "memory");
++ return prev;
++ case 2:
++ __asm__ __volatile__(LOCK "cmpxchgw %w1,%2"
++ : "=a"(prev)
++ : "q"(new), "m"(*__xg(ptr)), "0"(old)
++ : "memory");
++ return prev;
++ case 4:
++ __asm__ __volatile__(LOCK "cmpxchgl %1,%2"
++ : "=a"(prev)
++ : "q"(new), "m"(*__xg(ptr)), "0"(old)
++ : "memory");
++ return prev;
++ }
++ return old;
++}
++
++#define cmpxchg(ptr,o,n)\
++ ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
++ (unsigned long)(n),sizeof(*(ptr))))
++
++#ifdef __KERNEL__
++struct alt_instr {
++ __u8 *instr; /* original instruction */
++ __u8 *replacement;
++ __u8 cpuid; /* cpuid bit set for replacement */
++ __u8 instrlen; /* length of original instruction */
++ __u8 replacementlen; /* length of new instruction, <= instrlen */
++ __u8 pad;
++};
++#endif
++
++/*
++ * Alternative instructions for different CPU types or capabilities.
++ *
++ * This allows to use optimized instructions even on generic binary
++ * kernels.
++ *
++ * length of oldinstr must be longer or equal the length of newinstr
++ * It can be padded with nops as needed.
++ *
++ * For non barrier like inlines please define new variants
++ * without volatile and memory clobber.
++ */
++#define alternative(oldinstr, newinstr, feature) \
++ asm volatile ("661:\n\t" oldinstr "\n662:\n" \
++ ".section .altinstructions,\"a\"\n" \
++ " .align 4\n" \
++ " .long 661b\n" /* label */ \
++ " .long 663f\n" /* new instruction */ \
++ " .byte %c0\n" /* feature bit */ \
++ " .byte 662b-661b\n" /* sourcelen */ \
++ " .byte 664f-663f\n" /* replacementlen */ \
++ ".previous\n" \
++ ".section .altinstr_replacement,\"ax\"\n" \
++ "663:\n\t" newinstr "\n664:\n" /* replacement */ \
++ ".previous" :: "i" (feature) : "memory")
++
++/*
++ * Alternative inline assembly with input.
++ *
++ * Pecularities:
++ * No memory clobber here.
++ * Argument numbers start with 1.
++ * Best is to use constraints that are fixed size (like (%1) ... "r")
++ * If you use variable sized constraints like "m" or "g" in the
++ * replacement maake sure to pad to the worst case length.
++ */
++#define alternative_input(oldinstr, newinstr, feature, input...) \
++ asm volatile ("661:\n\t" oldinstr "\n662:\n" \
++ ".section .altinstructions,\"a\"\n" \
++ " .align 4\n" \
++ " .long 661b\n" /* label */ \
++ " .long 663f\n" /* new instruction */ \
++ " .byte %c0\n" /* feature bit */ \
++ " .byte 662b-661b\n" /* sourcelen */ \
++ " .byte 664f-663f\n" /* replacementlen */ \
++ ".previous\n" \
++ ".section .altinstr_replacement,\"ax\"\n" \
++ "663:\n\t" newinstr "\n664:\n" /* replacement */ \
++ ".previous" :: "i" (feature), ##input)
++
++/*
++ * Force strict CPU ordering.
++ * And yes, this is required on UP too when we're talking
++ * to devices.
++ *
++ * For now, "wmb()" doesn't actually do anything, as all
++ * Intel CPU's follow what Intel calls a *Processor Order*,
++ * in which all writes are seen in the program order even
++ * outside the CPU.
++ *
++ * I expect future Intel CPU's to have a weaker ordering,
++ * but I'd also expect them to finally get their act together
++ * and add some real memory barriers if so.
++ *
++ * Some non intel clones support out of order store. wmb() ceases to be a
++ * nop for these.
++ */
++
++
++/*
++ * Actually only lfence would be needed for mb() because all stores done
++ * by the kernel should be already ordered. But keep a full barrier for now.
++ */
++
++#define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2)
++#define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)
++
++/**
++ * read_barrier_depends - Flush all pending reads that subsequents reads
++ * depend on.
++ *
++ * No data-dependent reads from memory-like regions are ever reordered
++ * over this barrier. All reads preceding this primitive are guaranteed
++ * to access memory (but not necessarily other CPUs' caches) before any
++ * reads following this primitive that depend on the data return by
++ * any of the preceding reads. This primitive is much lighter weight than
++ * rmb() on most CPUs, and is never heavier weight than is
++ * rmb().
++ *
++ * These ordering constraints are respected by both the local CPU
++ * and the compiler.
++ *
++ * Ordering is not guaranteed by anything other than these primitives,
++ * not even by data dependencies. See the documentation for
++ * memory_barrier() for examples and URLs to more information.
++ *
++ * For example, the following code would force ordering (the initial
++ * value of "a" is zero, "b" is one, and "p" is "&a"):
++ *
++ * <programlisting>
++ * CPU 0 CPU 1
++ *
++ * b = 2;
++ * memory_barrier();
++ * p = &b; q = p;
++ * read_barrier_depends();
++ * d = *q;
++ * </programlisting>
++ *
++ * because the read of "*q" depends on the read of "p" and these
++ * two reads are separated by a read_barrier_depends(). However,
++ * the following code, with the same initial values for "a" and "b":
++ *
++ * <programlisting>
++ * CPU 0 CPU 1
++ *
++ * a = 2;
++ * memory_barrier();
++ * b = 3; y = b;
++ * read_barrier_depends();
++ * x = a;
++ * </programlisting>
++ *
++ * does not enforce ordering, since there is no data dependency between
++ * the read of "a" and the read of "b". Therefore, on some CPUs, such
++ * as Alpha, "y" could be set to 3 and "x" to 0. Use rmb()
++ * in cases like thiswhere there are no data dependencies.
++ **/
++
++#define read_barrier_depends() do { } while(0)
++
++#ifdef CONFIG_X86_OOSTORE
++/* Actually there are no OOO store capable CPUs for now that do SSE,
++ but make it already an possibility. */
++#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
++#else
++#define wmb() __asm__ __volatile__ ("": : :"memory")
++#endif
++
++#ifdef CONFIG_SMP
++#define smp_wmb() wmb()
++#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE)
++#define smp_alt_mb(instr) \
++__asm__ __volatile__("6667:\nnop\nnop\nnop\nnop\nnop\nnop\n6668:\n" \
++ ".section __smp_alternatives,\"a\"\n" \
++ ".long 6667b\n" \
++ ".long 6673f\n" \
++ ".previous\n" \
++ ".section __smp_replacements,\"a\"\n" \
++ "6673:.byte 6668b-6667b\n" \
++ ".byte 6670f-6669f\n" \
++ ".byte 6671f-6670f\n" \
++ ".byte 0\n" \
++ ".byte %c0\n" \
++ "6669:lock;addl $0,0(%%esp)\n" \
++ "6670:" instr "\n" \
++ "6671:\n" \
++ ".previous\n" \
++ : \
++ : "i" (X86_FEATURE_XMM2) \
++ : "memory")
++#define smp_rmb() smp_alt_mb("lfence")
++#define smp_mb() smp_alt_mb("mfence")
++#define set_mb(var, value) do { \
++unsigned long __set_mb_temp; \
++__asm__ __volatile__("6667:movl %1, %0\n6668:\n" \
++ ".section __smp_alternatives,\"a\"\n" \
++ ".long 6667b\n" \
++ ".long 6673f\n" \
++ ".previous\n" \
++ ".section __smp_replacements,\"a\"\n" \
++ "6673: .byte 6668b-6667b\n" \
++ ".byte 6670f-6669f\n" \
++ ".byte 0\n" \
++ ".byte 6671f-6670f\n" \
++ ".byte -1\n" \
++ "6669: xchg %1, %0\n" \
++ "6670:movl %1, %0\n" \
++ "6671:\n" \
++ ".previous\n" \
++ : "=m" (var), "=r" (__set_mb_temp) \
++ : "1" (value) \
++ : "memory"); } while (0)
++#else
++#define smp_rmb() rmb()
++#define smp_mb() mb()
++#define set_mb(var, value) do { xchg(&var, value); } while (0)
++#endif
++#define smp_read_barrier_depends() read_barrier_depends()
++#else
++#define smp_mb() barrier()
++#define smp_rmb() barrier()
++#define smp_wmb() barrier()
++#define smp_read_barrier_depends() do { } while(0)
++#define set_mb(var, value) do { var = value; barrier(); } while (0)
++#endif
++
++#define set_wmb(var, value) do { var = value; wmb(); } while (0)
++
++/* interrupt control.. */
++
++/*
++ * The use of 'barrier' in the following reflects their use as local-lock
++ * operations. Reentrancy must be prevented (e.g., __cli()) /before/ following
++ * critical operations are executed. All critical operations must complete
++ * /before/ reentrancy is permitted (e.g., __sti()). Alpha architecture also
++ * includes these barriers, for example.
++ */
++
++#define __cli() \
++do { \
++ vcpu_info_t *_vcpu; \
++ preempt_disable(); \
++ _vcpu = &HYPERVISOR_shared_info->vcpu_data[smp_processor_id()]; \
++ _vcpu->evtchn_upcall_mask = 1; \
++ preempt_enable_no_resched(); \
++ barrier(); \
++} while (0)
++
++#define __sti() \
++do { \
++ vcpu_info_t *_vcpu; \
++ barrier(); \
++ preempt_disable(); \
++ _vcpu = &HYPERVISOR_shared_info->vcpu_data[smp_processor_id()]; \
++ _vcpu->evtchn_upcall_mask = 0; \
++ barrier(); /* unmask then check (avoid races) */ \
++ if ( unlikely(_vcpu->evtchn_upcall_pending) ) \
++ force_evtchn_callback(); \
++ preempt_enable(); \
++} while (0)
++
++#define __save_flags(x) \
++do { \
++ vcpu_info_t *_vcpu; \
++ preempt_disable(); \
++ _vcpu = &HYPERVISOR_shared_info->vcpu_data[smp_processor_id()]; \
++ (x) = _vcpu->evtchn_upcall_mask; \
++ preempt_enable(); \
++} while (0)
++
++#define __restore_flags(x) \
++do { \
++ vcpu_info_t *_vcpu; \
++ barrier(); \
++ preempt_disable(); \
++ _vcpu = &HYPERVISOR_shared_info->vcpu_data[smp_processor_id()]; \
++ if ((_vcpu->evtchn_upcall_mask = (x)) == 0) { \
++ barrier(); /* unmask then check (avoid races) */ \
++ if ( unlikely(_vcpu->evtchn_upcall_pending) ) \
++ force_evtchn_callback(); \
++ preempt_enable(); \
++ } else \
++ preempt_enable_no_resched(); \
++} while (0)
++
++#define safe_halt() ((void)0)
++
++#define __save_and_cli(x) \
++do { \
++ vcpu_info_t *_vcpu; \
++ preempt_disable(); \
++ _vcpu = &HYPERVISOR_shared_info->vcpu_data[smp_processor_id()]; \
++ (x) = _vcpu->evtchn_upcall_mask; \
++ _vcpu->evtchn_upcall_mask = 1; \
++ preempt_enable_no_resched(); \
++ barrier(); \
++} while (0)
++
++#define local_irq_save(x) __save_and_cli(x)
++#define local_irq_restore(x) __restore_flags(x)
++#define local_save_flags(x) __save_flags(x)
++#define local_irq_disable() __cli()
++#define local_irq_enable() __sti()
++
++/* Cannot use preempt_enable() here as we would recurse in preempt_sched(). */
++#define irqs_disabled() \
++({ int ___x; \
++ vcpu_info_t *_vcpu; \
++ preempt_disable(); \
++ _vcpu = &HYPERVISOR_shared_info->vcpu_data[smp_processor_id()]; \
++ ___x = (_vcpu->evtchn_upcall_mask != 0); \
++ preempt_enable_no_resched(); \
++ ___x; })
++
++/*
++ * disable hlt during certain critical i/o operations
++ */
++#define HAVE_DISABLE_HLT
++void disable_hlt(void);
++void enable_hlt(void);
++
++extern int es7000_plat;
++void cpu_idle_wait(void);
++
++extern unsigned long arch_align_stack(unsigned long sp);
++
++#endif
+diff -Nurp ref-linux-2.6/include/asm-xen/asm-i386/system.h~ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/system.h~
+--- ref-linux-2.6/include/asm-xen/asm-i386/system.h~ 1969-12-31 19:00:00.000000000 -0500
++++ tmp-linux-2.6-xen.patch/include/asm-xen/asm-i386/system.h~ 2005-10-20 10:45:31.000000000 -0400
@@ -0,0 +1,588 @@
+#ifndef __ASM_SYSTEM_H
+#define __ASM_SYSTEM_H
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Oct 2005 17:43:32 -0000 1.2
+++ sources 9 Nov 2005 22:43:07 -0000 1.3
@@ -1,2 +1,2 @@
c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2
-e98696f012c4dbdf4e7f037d2863130a xen-20051021.tar.gz
+1863fcae4b328ea4d7da4d927038d98d xen-20051109.tar.gz
More information about the fedora-cvs-commits
mailing list