diff options
author | Michael Marineau <marineam@gentoo.org> | 2007-08-23 21:59:57 +0000 |
---|---|---|
committer | Michael Marineau <marineam@gentoo.org> | 2007-08-23 21:59:57 +0000 |
commit | e020df9ece2c8de4c033130c0811a49d28b69cee (patch) | |
tree | d61fb944b52169f1880dc0a93c8fa1545b23701a | |
parent | Kill bad patch and fix single proc domU builds correctly (I think) (diff) | |
download | xen-e020df9ece2c8de4c033130c0811a49d28b69cee.tar.gz xen-e020df9ece2c8de4c033130c0811a49d28b69cee.tar.bz2 xen-e020df9ece2c8de4c033130c0811a49d28b69cee.zip |
Reorganize the xen patchset to work more like genpatches/hardened and so we only have to roll one tarball.
svn path=/patches/; revision=18
-rw-r--r-- | trunk/2.6.18/00000_README (renamed from trunk/2.6.18/debian-security-patches/README) | 70 | ||||
-rw-r--r-- | trunk/2.6.18/10001_xen-3.1.0.patch (renamed from trunk/2.6.18/xen/patch-2.6.18_to_xen-3.1.0) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30001_nfnetlink_log-null-deref.patch (renamed from trunk/2.6.18/debian-security-patches/nfnetlink_log-null-deref.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30002_nf_conntrack-set-nfctinfo.patch (renamed from trunk/2.6.18/debian-security-patches/nf_conntrack-set-nfctinfo.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30003_netlink-infinite-recursion.patch (renamed from trunk/2.6.18/debian-security-patches/netlink-infinite-recursion.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30004_nl_fib_lookup-oops.patch (renamed from trunk/2.6.18/debian-security-patches/nl_fib_lookup-oops.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30005_core-dump-unreadable-PT_INTERP.patch (renamed from trunk/2.6.18/debian-security-patches/core-dump-unreadable-PT_INTERP.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30006_appletalk-length-mismatch.patch (renamed from trunk/2.6.18/debian-security-patches/appletalk-length-mismatch.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30007_cm4040-buffer-overflow.patch (renamed from trunk/2.6.18/debian-security-patches/cm4040-buffer-overflow.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30008_ipv6_fl_socklist-no-share.patch (renamed from trunk/2.6.18/debian-security-patches/ipv6_fl_socklist-no-share.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30009_keys-serial-num-collision.patch (renamed from trunk/2.6.18/debian-security-patches/keys-serial-num-collision.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/30010_ipv6_getsockopt_sticky-null-opt.patch (renamed from trunk/2.6.18/debian-security-patches/ipv6_getsockopt_sticky-null-opt.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.18/50001_make-install.patch | 52 | ||||
-rw-r--r-- | trunk/2.6.18/50002_always-enable-xen-genapic.patch | 12 | ||||
-rw-r--r-- | trunk/2.6.20/00000_README | 47 | ||||
-rw-r--r-- | trunk/2.6.20/20950_linux-2.6-xen.patch (renamed from trunk/2.6.20/fedora-xen/patch-2.6.20_to_xen-3.1.0-fc7-2925) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/20952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch (renamed from trunk/2.6.20/fedora-xen-patches/0952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/20956-linux-2.6-fix-x86_64-smp.patch (renamed from trunk/2.6.20/fedora-xen-patches/0956-linux-2.6-fix-x86_64-smp.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/20957-linux-2.6-fix-x86_64-vgetcpu.patch (renamed from trunk/2.6.20/fedora-xen-patches/0957-linux-2.6-fix-x86_64-vgetcpu.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/20958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch (renamed from trunk/2.6.20/fedora-xen-patches/0958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/20959-linux-2.6-xen-fix-nosegneg-detection.patch (renamed from trunk/2.6.20/fedora-xen-patches/0959-linux-2.6-xen-fix-nosegneg-detection.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/20960-linux-2.6-xen-blkfront-wait-add.patch (renamed from trunk/2.6.20/fedora-xen-patches/0960-linux-2.6-xen-blkfront-wait-add.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/21665-linux-2.6-disable-netback-checksum.patch (renamed from trunk/2.6.20/fedora-xen-patches/1665-linux-2.6-disable-netback-checksum.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/23000-linux-2.6-acpi-config_pm-poweroff.patch (renamed from trunk/2.6.20/fedora-xen-patches/3000-linux-2.6-acpi-config_pm-poweroff.patch) | 0 | ||||
-rw-r--r-- | trunk/2.6.20/50001_make-install.patch | 52 | ||||
-rw-r--r-- | trunk/2.6.20/50002_always-enable-xen-genapic.patch | 12 | ||||
-rw-r--r-- | trunk/2.6.20/50003_console-tty-fix.patch | 75 | ||||
-rw-r--r-- | trunk/2.6.20/50004_quirks-no-smp-fix.patch | 12 |
28 files changed, 318 insertions, 14 deletions
diff --git a/trunk/2.6.18/debian-security-patches/README b/trunk/2.6.18/00000_README index 4cce70c..b977d3e 100644 --- a/trunk/2.6.18/debian-security-patches/README +++ b/trunk/2.6.18/00000_README @@ -1,42 +1,84 @@ - * bugfix/nfnetlink_log-null-deref.patch +Xen Patches README +------------------ + +These patches are intended to be stacked on top of genpatches-base. + +Many of the patches included here are swiped from various sources which +use their own four digit patch numbering scheme, so we are stuck with five +digits to indiciate the source for easier tracking and re-syncing. + +Numbering +--------- + +0xxxx Gentoo, not related to Xen. (in case we pull something from extras) +1xxxx XenSource, upstream Xen patch for 2.6.18 +2xxxx Redhat, we use their Xen patch for >=2.6.20 +3xxxx Debian, we use their security fixes for 2.6.18 +5xxxx Gentoo, Xen and other fixes for Redhat and/or Debian patches. + +Patches +------- + +10001_xen-3.1.0.patch + Upstream 3.1.0 patch + +30001_nfnetlink_log-null-deref.patch [SECURITY] Fix remotely exploitable NULL pointer dereference in nfulnl_recv_config() See CVE-2007-1496 - * bugfix/nf_conntrack-set-nfctinfo.patch + +30002_nf_conntrack-set-nfctinfo.patch [SECURITY] Fix incorrect classification of IPv6 fragments as ESTABLISHED, which allows remote attackers to bypass certain rulesets See CVE-2007-1497 - * bugfix/netlink-infinite-recursion.patch + +30003_netlink-infinite-recursion.patch [SECURITY] Fix infinite recursion bug in netlink See CVE-2007-1861 - * bugfix/nl_fib_lookup-oops.patch + +30004_nl_fib_lookup-oops.patch Add fix for oops bug added by previous patch - * bugfix/core-dump-unreadable-PT_INTERP.patch + +30005_core-dump-unreadable-PT_INTERP.patch [SECURITY] Fix a vulnerability that allows local users to read otherwise unreadable (but executable) files by triggering a core dump. See CVE-2007-0958 - * bugfix/appletalk-length-mismatch.patch + +30006_appletalk-length-mismatch.patch [SECURITY] Fix a remote DoS (crash) in appletalk Depends upon bugfix/appletalk-endianness-annotations.patch See CVE-2007-1357 - * bugfix/cm4040-buffer-overflow.patch + +30007_cm4040-buffer-overflow.patch [SECURITY] Fix a buffer overflow in the Omnikey CardMan 4040 driver See CVE-2007-0005 - * bugfix/ipv6_fl_socklist-no-share.patch + +30008_ipv6_fl_socklist-no-share.patch [SECURITY] Fix local DoS vulnerability caused by inadvertently sharing ipv6_fl_socklist between the listening socket and the socket created for connection. See CVE-2007-1592 - * bugfix/keys-serial-num-collision.patch + +30009_keys-serial-num-collision.patch [SECURITY] Fix the key serial number collision avoidance code in key_alloc_serial() that could lead to a local DoS (oops). (closes: #398470) See CVE-2007-0006 - * bugfix/ipv6_getsockopt_sticky-null-opt.patch - [SECURITY] Fix NULL dereference in ipv6_setsockopt that could lead - to a local DoS (oops). - See CVE-2007-1388 - * bugfix/ipv6_getsockopt_sticky-null-opt.patch + +30010_ipv6_getsockopt_sticky-null-opt.patch [SECURITY] Fix kernel memory leak vulnerability in ipv6_getsockopt_sticky() which can be triggered by passing a len < 0. See CVE-2007-1000 + +????? bugfix/ipv6_getsockopt_sticky-null-opt.patch + [SECURITY] Fix NULL dereference in ipv6_setsockopt that could lead + to a local DoS (oops). + See CVE-2007-1388 + +50001_make-install.patch + Handle make install in a semi-sane way that plays nice with + split domU/dom0 kernels. + +50002_always-enable-xen-genapic.patch + Compile fix for non-SMP (UP) kernels. Since UP support is broken in + upstream Xen I'm not sure if I trust it or not. :-P diff --git a/trunk/2.6.18/xen/patch-2.6.18_to_xen-3.1.0 b/trunk/2.6.18/10001_xen-3.1.0.patch index 1684dea..1684dea 100644 --- a/trunk/2.6.18/xen/patch-2.6.18_to_xen-3.1.0 +++ b/trunk/2.6.18/10001_xen-3.1.0.patch diff --git a/trunk/2.6.18/debian-security-patches/nfnetlink_log-null-deref.patch b/trunk/2.6.18/30001_nfnetlink_log-null-deref.patch index b86a409..b86a409 100644 --- a/trunk/2.6.18/debian-security-patches/nfnetlink_log-null-deref.patch +++ b/trunk/2.6.18/30001_nfnetlink_log-null-deref.patch diff --git a/trunk/2.6.18/debian-security-patches/nf_conntrack-set-nfctinfo.patch b/trunk/2.6.18/30002_nf_conntrack-set-nfctinfo.patch index f540a67..f540a67 100644 --- a/trunk/2.6.18/debian-security-patches/nf_conntrack-set-nfctinfo.patch +++ b/trunk/2.6.18/30002_nf_conntrack-set-nfctinfo.patch diff --git a/trunk/2.6.18/debian-security-patches/netlink-infinite-recursion.patch b/trunk/2.6.18/30003_netlink-infinite-recursion.patch index df76325..df76325 100644 --- a/trunk/2.6.18/debian-security-patches/netlink-infinite-recursion.patch +++ b/trunk/2.6.18/30003_netlink-infinite-recursion.patch diff --git a/trunk/2.6.18/debian-security-patches/nl_fib_lookup-oops.patch b/trunk/2.6.18/30004_nl_fib_lookup-oops.patch index c0547fa..c0547fa 100644 --- a/trunk/2.6.18/debian-security-patches/nl_fib_lookup-oops.patch +++ b/trunk/2.6.18/30004_nl_fib_lookup-oops.patch diff --git a/trunk/2.6.18/debian-security-patches/core-dump-unreadable-PT_INTERP.patch b/trunk/2.6.18/30005_core-dump-unreadable-PT_INTERP.patch index 33c7c4f..33c7c4f 100644 --- a/trunk/2.6.18/debian-security-patches/core-dump-unreadable-PT_INTERP.patch +++ b/trunk/2.6.18/30005_core-dump-unreadable-PT_INTERP.patch diff --git a/trunk/2.6.18/debian-security-patches/appletalk-length-mismatch.patch b/trunk/2.6.18/30006_appletalk-length-mismatch.patch index b82c4fe..b82c4fe 100644 --- a/trunk/2.6.18/debian-security-patches/appletalk-length-mismatch.patch +++ b/trunk/2.6.18/30006_appletalk-length-mismatch.patch diff --git a/trunk/2.6.18/debian-security-patches/cm4040-buffer-overflow.patch b/trunk/2.6.18/30007_cm4040-buffer-overflow.patch index 3047ff6..3047ff6 100644 --- a/trunk/2.6.18/debian-security-patches/cm4040-buffer-overflow.patch +++ b/trunk/2.6.18/30007_cm4040-buffer-overflow.patch diff --git a/trunk/2.6.18/debian-security-patches/ipv6_fl_socklist-no-share.patch b/trunk/2.6.18/30008_ipv6_fl_socklist-no-share.patch index 8749435..8749435 100644 --- a/trunk/2.6.18/debian-security-patches/ipv6_fl_socklist-no-share.patch +++ b/trunk/2.6.18/30008_ipv6_fl_socklist-no-share.patch diff --git a/trunk/2.6.18/debian-security-patches/keys-serial-num-collision.patch b/trunk/2.6.18/30009_keys-serial-num-collision.patch index 9875900..9875900 100644 --- a/trunk/2.6.18/debian-security-patches/keys-serial-num-collision.patch +++ b/trunk/2.6.18/30009_keys-serial-num-collision.patch diff --git a/trunk/2.6.18/debian-security-patches/ipv6_getsockopt_sticky-null-opt.patch b/trunk/2.6.18/30010_ipv6_getsockopt_sticky-null-opt.patch index 1a124c2..1a124c2 100644 --- a/trunk/2.6.18/debian-security-patches/ipv6_getsockopt_sticky-null-opt.patch +++ b/trunk/2.6.18/30010_ipv6_getsockopt_sticky-null-opt.patch diff --git a/trunk/2.6.18/50001_make-install.patch b/trunk/2.6.18/50001_make-install.patch new file mode 100644 index 0000000..108c648 --- /dev/null +++ b/trunk/2.6.18/50001_make-install.patch @@ -0,0 +1,52 @@ +diff -ru linux-2.6.18-xen.orig/arch/i386/Makefile linux-2.6.18-xen/arch/i386/Makefile +--- linux-2.6.18-xen.orig/arch/i386/Makefile 2007-07-16 17:58:05.000000000 -0700 ++++ linux-2.6.18-xen/arch/i386/Makefile 2007-07-16 18:22:18.000000000 -0700 +@@ -125,7 +125,7 @@ + $(Q)$(MAKE) $(build)=$(boot) $@ + + install: +- $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ ++ $(Q)$(MAKE) $(build)=$(boot) $@ + else + all: bzImage + +diff -ru linux-2.6.18-xen.orig/arch/i386/boot-xen/Makefile linux-2.6.18-xen/arch/i386/boot-xen/Makefile +--- linux-2.6.18-xen.orig/arch/i386/boot-xen/Makefile 2007-07-16 17:58:05.000000000 -0700 ++++ linux-2.6.18-xen/arch/i386/boot-xen/Makefile 2007-07-16 18:36:08.000000000 -0700 +@@ -10,12 +10,17 @@ + INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH)) + + XINSTALL_NAME ?= $(KERNELRELEASE) ++ ++ifdef CONFIG_XEN_PRIVILEGED_GUEST ++XENGUEST= ++else ++XENGUEST=-domU ++endif ++ + install: + mkdir -p $(INSTALL_ROOT)/boot +- ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) +- rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-xen$(XENGUEST)$(INSTALL_SUFFIX) +diff -ru linux-2.6.18-xen.orig/arch/x86_64/Makefile linux-2.6.18-xen/arch/x86_64/Makefile +--- linux-2.6.18-xen.orig/arch/x86_64/Makefile 2007-07-16 17:58:05.000000000 -0700 ++++ linux-2.6.18-xen/arch/x86_64/Makefile 2007-07-16 18:22:34.000000000 -0700 +@@ -91,7 +91,7 @@ + $(Q)$(MAKE) $(build)=$(boot) $@ + + install: +- $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ ++ $(Q)$(MAKE) $(build)=$(boot) $@ + else + #Default target when executing "make" + all: bzImage diff --git a/trunk/2.6.18/50002_always-enable-xen-genapic.patch b/trunk/2.6.18/50002_always-enable-xen-genapic.patch new file mode 100644 index 0000000..a9b8b77 --- /dev/null +++ b/trunk/2.6.18/50002_always-enable-xen-genapic.patch @@ -0,0 +1,12 @@ +diff -ru linux-2.6.18-xen.orig/arch/x86_64/Kconfig linux-2.6.18-xen/arch/x86_64/Kconfig +--- linux-2.6.18-xen.orig/arch/x86_64/Kconfig 2007-08-07 17:37:58.000000000 -0700 ++++ linux-2.6.18-xen/arch/x86_64/Kconfig 2007-08-07 17:39:32.000000000 -0700 +@@ -234,7 +234,7 @@ + config X86_XEN_GENAPIC + bool + depends X86_64_XEN +- default XEN_PRIVILEGED_GUEST || SMP ++ default y + + config X86_LOCAL_APIC + bool diff --git a/trunk/2.6.20/00000_README b/trunk/2.6.20/00000_README new file mode 100644 index 0000000..9ad6f94 --- /dev/null +++ b/trunk/2.6.20/00000_README @@ -0,0 +1,47 @@ +Xen Patches README +------------------ + +These patches are intended to be stacked on top of genpatches-base. + +Many of the patches included here are swiped from various sources which +use their own four digit patch numbering scheme, so we are stuck with five +digits to indiciate the source for easier tracking and re-syncing. + +Numbering +--------- + +0xxxx Gentoo, not related to Xen. (in case we pull something from extras) +1xxxx XenSource, upstream Xen patch for 2.6.18 +2xxxx Redhat, we use their Xen patch for >=2.6.20 +3xxxx Debian, we use their security fixes for 2.6.18 +5xxxx Gentoo, Xen and other fixes for Redhat and/or Debian patches. + +Patches +------- + +20950_linux-2.6-xen.patch + Main Xen patch + +20952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch +20956-linux-2.6-fix-x86_64-smp.patch +20957-linux-2.6-fix-x86_64-vgetcpu.patch +20958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch +20959-linux-2.6-xen-fix-nosegneg-detection.patch +20960-linux-2.6-xen-blkfront-wait-add.patch +21665-linux-2.6-disable-netback-checksum.patch +23000-linux-2.6-acpi-config_pm-poweroff.patch + +50001_make-install.patch + Handle make install in a semi-sane way that plays nice with + split domU/dom0 kernels. + +50002_always-enable-xen-genapic.patch + Compile fix for non-SMP (UP) kernels. Since UP support is broken in + upstream Xen I'm not sure if I trust it or not. :-P + +50003_console-tty-fix.patch + Steal tty1-63 as the upstream Xen release does so people don't get + any supprises. Redhat switched to using the special Xen tty device. + +50004_quirks-no-smp-fix.patch + Another compile fix for non-SMP (UP) kernels. diff --git a/trunk/2.6.20/fedora-xen/patch-2.6.20_to_xen-3.1.0-fc7-2925 b/trunk/2.6.20/20950_linux-2.6-xen.patch index 9c58fd2..9c58fd2 100644 --- a/trunk/2.6.20/fedora-xen/patch-2.6.20_to_xen-3.1.0-fc7-2925 +++ b/trunk/2.6.20/20950_linux-2.6-xen.patch diff --git a/trunk/2.6.20/fedora-xen-patches/0952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch b/trunk/2.6.20/20952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch index 788af81..788af81 100644 --- a/trunk/2.6.20/fedora-xen-patches/0952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch +++ b/trunk/2.6.20/20952-linux-2.6-xen-x86_64-silence-up-apic-errors.patch diff --git a/trunk/2.6.20/fedora-xen-patches/0956-linux-2.6-fix-x86_64-smp.patch b/trunk/2.6.20/20956-linux-2.6-fix-x86_64-smp.patch index 24796a5..24796a5 100644 --- a/trunk/2.6.20/fedora-xen-patches/0956-linux-2.6-fix-x86_64-smp.patch +++ b/trunk/2.6.20/20956-linux-2.6-fix-x86_64-smp.patch diff --git a/trunk/2.6.20/fedora-xen-patches/0957-linux-2.6-fix-x86_64-vgetcpu.patch b/trunk/2.6.20/20957-linux-2.6-fix-x86_64-vgetcpu.patch index 17e0247..17e0247 100644 --- a/trunk/2.6.20/fedora-xen-patches/0957-linux-2.6-fix-x86_64-vgetcpu.patch +++ b/trunk/2.6.20/20957-linux-2.6-fix-x86_64-vgetcpu.patch diff --git a/trunk/2.6.20/fedora-xen-patches/0958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch b/trunk/2.6.20/20958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch index e46e657..e46e657 100644 --- a/trunk/2.6.20/fedora-xen-patches/0958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch +++ b/trunk/2.6.20/20958-linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch diff --git a/trunk/2.6.20/fedora-xen-patches/0959-linux-2.6-xen-fix-nosegneg-detection.patch b/trunk/2.6.20/20959-linux-2.6-xen-fix-nosegneg-detection.patch index 915b84a..915b84a 100644 --- a/trunk/2.6.20/fedora-xen-patches/0959-linux-2.6-xen-fix-nosegneg-detection.patch +++ b/trunk/2.6.20/20959-linux-2.6-xen-fix-nosegneg-detection.patch diff --git a/trunk/2.6.20/fedora-xen-patches/0960-linux-2.6-xen-blkfront-wait-add.patch b/trunk/2.6.20/20960-linux-2.6-xen-blkfront-wait-add.patch index e17438b..e17438b 100644 --- a/trunk/2.6.20/fedora-xen-patches/0960-linux-2.6-xen-blkfront-wait-add.patch +++ b/trunk/2.6.20/20960-linux-2.6-xen-blkfront-wait-add.patch diff --git a/trunk/2.6.20/fedora-xen-patches/1665-linux-2.6-disable-netback-checksum.patch b/trunk/2.6.20/21665-linux-2.6-disable-netback-checksum.patch index 18b4dae..18b4dae 100644 --- a/trunk/2.6.20/fedora-xen-patches/1665-linux-2.6-disable-netback-checksum.patch +++ b/trunk/2.6.20/21665-linux-2.6-disable-netback-checksum.patch diff --git a/trunk/2.6.20/fedora-xen-patches/3000-linux-2.6-acpi-config_pm-poweroff.patch b/trunk/2.6.20/23000-linux-2.6-acpi-config_pm-poweroff.patch index e925785..e925785 100644 --- a/trunk/2.6.20/fedora-xen-patches/3000-linux-2.6-acpi-config_pm-poweroff.patch +++ b/trunk/2.6.20/23000-linux-2.6-acpi-config_pm-poweroff.patch diff --git a/trunk/2.6.20/50001_make-install.patch b/trunk/2.6.20/50001_make-install.patch new file mode 100644 index 0000000..108c648 --- /dev/null +++ b/trunk/2.6.20/50001_make-install.patch @@ -0,0 +1,52 @@ +diff -ru linux-2.6.18-xen.orig/arch/i386/Makefile linux-2.6.18-xen/arch/i386/Makefile +--- linux-2.6.18-xen.orig/arch/i386/Makefile 2007-07-16 17:58:05.000000000 -0700 ++++ linux-2.6.18-xen/arch/i386/Makefile 2007-07-16 18:22:18.000000000 -0700 +@@ -125,7 +125,7 @@ + $(Q)$(MAKE) $(build)=$(boot) $@ + + install: +- $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ ++ $(Q)$(MAKE) $(build)=$(boot) $@ + else + all: bzImage + +diff -ru linux-2.6.18-xen.orig/arch/i386/boot-xen/Makefile linux-2.6.18-xen/arch/i386/boot-xen/Makefile +--- linux-2.6.18-xen.orig/arch/i386/boot-xen/Makefile 2007-07-16 17:58:05.000000000 -0700 ++++ linux-2.6.18-xen/arch/i386/boot-xen/Makefile 2007-07-16 18:36:08.000000000 -0700 +@@ -10,12 +10,17 @@ + INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH)) + + XINSTALL_NAME ?= $(KERNELRELEASE) ++ ++ifdef CONFIG_XEN_PRIVILEGED_GUEST ++XENGUEST= ++else ++XENGUEST=-domU ++endif ++ + install: + mkdir -p $(INSTALL_ROOT)/boot +- ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) +- rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) +- ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX) ++ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-xen$(XENGUEST)$(INSTALL_SUFFIX) +diff -ru linux-2.6.18-xen.orig/arch/x86_64/Makefile linux-2.6.18-xen/arch/x86_64/Makefile +--- linux-2.6.18-xen.orig/arch/x86_64/Makefile 2007-07-16 17:58:05.000000000 -0700 ++++ linux-2.6.18-xen/arch/x86_64/Makefile 2007-07-16 18:22:34.000000000 -0700 +@@ -91,7 +91,7 @@ + $(Q)$(MAKE) $(build)=$(boot) $@ + + install: +- $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ ++ $(Q)$(MAKE) $(build)=$(boot) $@ + else + #Default target when executing "make" + all: bzImage diff --git a/trunk/2.6.20/50002_always-enable-xen-genapic.patch b/trunk/2.6.20/50002_always-enable-xen-genapic.patch new file mode 100644 index 0000000..a9b8b77 --- /dev/null +++ b/trunk/2.6.20/50002_always-enable-xen-genapic.patch @@ -0,0 +1,12 @@ +diff -ru linux-2.6.18-xen.orig/arch/x86_64/Kconfig linux-2.6.18-xen/arch/x86_64/Kconfig +--- linux-2.6.18-xen.orig/arch/x86_64/Kconfig 2007-08-07 17:37:58.000000000 -0700 ++++ linux-2.6.18-xen/arch/x86_64/Kconfig 2007-08-07 17:39:32.000000000 -0700 +@@ -234,7 +234,7 @@ + config X86_XEN_GENAPIC + bool + depends X86_64_XEN +- default XEN_PRIVILEGED_GUEST || SMP ++ default y + + config X86_LOCAL_APIC + bool diff --git a/trunk/2.6.20/50003_console-tty-fix.patch b/trunk/2.6.20/50003_console-tty-fix.patch new file mode 100644 index 0000000..72a90a8 --- /dev/null +++ b/trunk/2.6.20/50003_console-tty-fix.patch @@ -0,0 +1,75 @@ +diff -rup linux-2.6.20-xen.orig/drivers/char/tty_io.c linux-2.6.20-xen/drivers/char/tty_io.c +--- linux-2.6.20-xen.orig/drivers/char/tty_io.c 2007-07-16 11:14:52.000000000 -0700 ++++ linux-2.6.20-xen/drivers/char/tty_io.c 2007-07-16 15:57:19.000000000 -0700 +@@ -133,6 +133,8 @@ LIST_HEAD(tty_drivers); /* linked list + DEFINE_MUTEX(tty_mutex); + EXPORT_SYMBOL(tty_mutex); + ++int console_use_vt = 1; ++ + #ifdef CONFIG_UNIX98_PTYS + extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ + extern int pty_limit; /* Config limit on Unix98 ptys */ +@@ -2518,7 +2520,7 @@ retry_open: + goto got_driver; + } + #ifdef CONFIG_VT +- if (device == MKDEV(TTY_MAJOR,0)) { ++ if (console_use_vt && (device == MKDEV(TTY_MAJOR,0))) { + extern struct tty_driver *console_driver; + driver = console_driver; + index = fg_console; +@@ -3910,6 +3912,8 @@ static int __init tty_init(void) + #endif + + #ifdef CONFIG_VT ++ if (!console_use_vt) ++ goto out_vt; + cdev_init(&vc0_cdev, &console_fops); + if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || + register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) +@@ -3917,6 +3921,7 @@ static int __init tty_init(void) + device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0"); + + vty_init(); ++ out_vt: + #endif + return 0; + } +diff -rup linux-2.6.20-xen.orig/drivers/xen/console/console.c linux-2.6.20-xen/drivers/xen/console/console.c +--- linux-2.6.20-xen.orig/drivers/xen/console/console.c 2007-07-16 11:14:52.000000000 -0700 ++++ linux-2.6.20-xen/drivers/xen/console/console.c 2007-07-16 16:02:26.000000000 -0700 +@@ -86,23 +86,30 @@ static unsigned long sysrq_requested; + + void xencons_early_setup(void) + { +- if (is_initial_xendomain()) ++ extern int console_use_vt; ++ ++ if (is_initial_xendomain()) { + xc_mode = XC_SERIAL; +- else +- xc_mode = XC_XVC; ++ } else { ++ xc_mode = XC_TTY; ++ console_use_vt = 0; ++ } + } + + static int __init xencons_setup(char *str) + { + char *q; + int n; ++ extern int console_use_vt; + ++ console_use_vt = 1; + if (!strncmp(str, "ttyS", 4)) { + xc_mode = XC_SERIAL; + str += 4; + } else if (!strncmp(str, "tty", 3)) { + xc_mode = XC_TTY; + str += 3; ++ console_use_vt = 0; + } else if (!strncmp(str, "xvc", 3)) { + xc_mode = XC_XVC; + str += 3; diff --git a/trunk/2.6.20/50004_quirks-no-smp-fix.patch b/trunk/2.6.20/50004_quirks-no-smp-fix.patch new file mode 100644 index 0000000..77de84c --- /dev/null +++ b/trunk/2.6.20/50004_quirks-no-smp-fix.patch @@ -0,0 +1,12 @@ +diff -rup linux-2.6.20-xen.orig/arch/i386/kernel/quirks.c linux-2.6.20-xen/arch/i386/kernel/quirks.c +--- linux-2.6.20-xen.orig/arch/i386/kernel/quirks.c 2007-07-23 10:59:51.000000000 -0700 ++++ linux-2.6.20-xen/arch/i386/kernel/quirks.c 2007-07-23 11:02:15.000000000 -0700 +@@ -7,7 +7,7 @@ + #include <asm/genapic.h> + #include <asm/cpu.h> + +-#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_SMP) || defined(CONFIG_XEN)) && defined(CONFIG_PCI) ++#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI) + static void __devinit verify_quirk_intel_irqbalance(struct pci_dev *dev) + { + u8 config, rev; |