From d42cb56892f3517a35a0b958efb1969777a8f182 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Wed, 7 Jul 2010 13:15:47 +0200 Subject: [PATCH] Upgrade to 2.6.34.1 --- config-xenlinux | 11 ++++++----- patches.xen/xen3-fixup-xen | 9 --------- series.conf | 6 +++--- version | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/config-xenlinux b/config-xenlinux index d2473be..19d7cca 100644 --- a/config-xenlinux +++ b/config-xenlinux @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.34 -# Sat Jun 12 16:15:52 2010 +# Linux kernel version: 2.6.34.1 +# Wed Jul 7 12:58:00 2010 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -55,8 +55,8 @@ CONFIG_X86_NO_IDT=y # CONFIG_KTIME_SCALAR is not set CONFIG_SUSE_KERNEL=y # CONFIG_ENTERPRISE_SUPPORT is not set -CONFIG_SPLIT_PACKAGE=n -CONFIG_KERNEL_DESKTOP=n +# CONFIG_SPLIT_PACKAGE is not set +# CONFIG_KERNEL_DESKTOP is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -66,7 +66,7 @@ CONFIG_CONSTRUCTORS=y CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="-1-xenlinux" +CONFIG_LOCALVERSION="-9.xenlinux.qubes.x86_64" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_KERNEL_GZIP=y @@ -1079,6 +1079,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen index 32e3846..7ef8f87 100644 --- a/patches.xen/xen3-fixup-xen +++ b/patches.xen/xen3-fixup-xen @@ -1851,15 +1851,6 @@ Acked-by: jbeulich@novell.com return err; } -@@ -499,7 +542,7 @@ int xenbus_printf(struct xenbus_transact - #define PRINTF_BUFFER_SIZE 4096 - char *printf_buffer; - -- printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL); -+ printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_NOIO | __GFP_HIGH); - if (printf_buffer == NULL) - return -ENOMEM; - @@ -622,6 +665,8 @@ void unregister_xenbus_watch(struct xenb char token[sizeof(watch) * 2 + 1]; int err; diff --git a/series.conf b/series.conf index bcb3f3d..81250dd 100644 --- a/series.conf +++ b/series.conf @@ -192,7 +192,7 @@ patches.fixes/ptrace-getsiginfo patches.arch/ppc-ipic-suspend-without-83xx-fix patches.arch/ppc-vmcoreinfo.diff - patches.fixes/powerpc-fix-handling-of-strnlen-with-zero-len +# patches.fixes/powerpc-fix-handling-of-strnlen-with-zero-len ######################################################## # PS3 @@ -339,7 +339,7 @@ ######################################################## # cifs patches ######################################################## - patches.fixes/cifs-fix-oops-due-to-null-nameidata +# patches.fixes/cifs-fix-oops-due-to-null-nameidata ######################################################## # ext2/ext3 @@ -554,7 +554,7 @@ ######################################################## # sysfs / driver core ######################################################## - patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch +# patches.drivers/driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch ######################################################## # USB diff --git a/version b/version index 93e101a..c6a7435 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.6.34 +2.6.34.1