Update to 2.6.39-rc4
svn path=/dists/trunk/linux-2.6/; revision=17229
This commit is contained in:
parent
05eecd66c9
commit
87a864d7c0
|
@ -1,4 +1,4 @@
|
||||||
linux-2.6 (2.6.39~rc2-1~experimental.1) UNRELEASED; urgency=low
|
linux-2.6 (2.6.39~rc4-1~experimental.1) UNRELEASED; urgency=low
|
||||||
|
|
||||||
* New upstream release candidate
|
* New upstream release candidate
|
||||||
|
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
Subject: [PATCH] Save cr4 to mmu_cr4_features at boot time
|
|
||||||
Date: Thu, 31 Mar 2011 14:48:44 -0000
|
|
||||||
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
|
||||||
|
|
||||||
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
|
||||||
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
|
|
||||||
---
|
|
||||||
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
|
|
||||||
index 5a0484a..0943eb2 100644
|
|
||||||
--- a/arch/x86/kernel/setup.c
|
|
||||||
+++ b/arch/x86/kernel/setup.c
|
|
||||||
@@ -891,6 +891,7 @@ void __init setup_arch(char **cmdline_p)
|
|
||||||
max_low_pfn = max_pfn;
|
|
||||||
|
|
||||||
high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;
|
|
||||||
+ mmu_cr4_features = read_cr4();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
|
@ -44,4 +44,3 @@
|
||||||
+ debian/sched-autogroup-disabled.patch
|
+ debian/sched-autogroup-disabled.patch
|
||||||
+ bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch
|
+ bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch
|
||||||
+ bugfix/all/rt2800-disable-powersaving-as-default.patch
|
+ bugfix/all/rt2800-disable-powersaving-as-default.patch
|
||||||
+ bugfix/x86/Save-cr4-to-mmu_cr4_features-at-boot-time.patch
|
|
||||||
|
|
Loading…
Reference in New Issue