QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to 2.6.34.1

Browse Source
This commit is contained in:
Joanna Rutkowska 2010-07-07 13:15:47 +02:00
parent d1298d1dfb
commit d42cb56892
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config-xenlinux
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.34 # Linux kernel version: 2.6.34.1
# Sat Jun 12 16:15:52 2010 # Wed Jul 7 12:58:00 2010
# #
CONFIG_64BIT=y CONFIG_64BIT=y
# CONFIG_X86_32 is not set # CONFIG_X86_32 is not set
@ -55,8 +55,8 @@ CONFIG_X86_NO_IDT=y
# CONFIG_KTIME_SCALAR is not set # CONFIG_KTIME_SCALAR is not set
CONFIG_SUSE_KERNEL=y CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set # CONFIG_ENTERPRISE_SUPPORT is not set
CONFIG_SPLIT_PACKAGE=n # CONFIG_SPLIT_PACKAGE is not set
CONFIG_KERNEL_DESKTOP=n # CONFIG_KERNEL_DESKTOP is not set
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y CONFIG_CONSTRUCTORS=y
@ -66,7 +66,7 @@ CONFIG_CONSTRUCTORS=y
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION="-1-xenlinux" CONFIG_LOCALVERSION="-9.xenlinux.qubes.x86_64"
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_KERNEL_GZIP=y CONFIG_KERNEL_GZIP=y
@ -1079,6 +1079,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m
CONFIG_LIB80211_CRYPT_TKIP=m CONFIG_LIB80211_CRYPT_TKIP=m
# CONFIG_LIB80211_DEBUG is not set # CONFIG_LIB80211_DEBUG is not set
CONFIG_MAC80211=m CONFIG_MAC80211=m
CONFIG_MAC80211_HAS_RC=y
CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL=y
# CONFIG_MAC80211_RC_DEFAULT_PID is not set # CONFIG_MAC80211_RC_DEFAULT_PID is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y

9
patches.xen/xen3-fixup-xen
View File

@ -1851,15 +1851,6 @@ Acked-by: jbeulich@novell.com
return err; 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 @@ -622,6 +665,8 @@ void unregister_xenbus_watch(struct xenb
char token[sizeof(watch) * 2 + 1]; char token[sizeof(watch) * 2 + 1];
int err; int err;

6
series.conf
View File

@ -192,7 +192,7 @@
patches.fixes/ptrace-getsiginfo patches.fixes/ptrace-getsiginfo
patches.arch/ppc-ipic-suspend-without-83xx-fix patches.arch/ppc-ipic-suspend-without-83xx-fix
patches.arch/ppc-vmcoreinfo.diff 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 # PS3
@ -339,7 +339,7 @@
######################################################## ########################################################
# cifs patches # cifs patches
######################################################## ########################################################
patches.fixes/cifs-fix-oops-due-to-null-nameidata # patches.fixes/cifs-fix-oops-due-to-null-nameidata
######################################################## ########################################################
# ext2/ext3 # ext2/ext3
@ -554,7 +554,7 @@
######################################################## ########################################################
# sysfs / driver core # 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 # USB

2
version
View File

@ -1 +1 @@
2.6.34 2.6.34.1