.31 patches

diff --git a/queue-2.6.31/hwmon-coretemp-add-missing-newline-to-dev_warn-message.patch b/queue-2.6.31/hwmon-coretemp-add-missing-newline-to-dev_warn-message.patch
new file mode 100644 (file)
index 0000000..e134d33
--- /dev/null
+++ b/queue-2.6.31/hwmon-coretemp-add-missing-newline-to-dev_warn-message.patch
@@ -0,0 +1,32 @@
+From 4d7a5644e4adfafe76c2bd8ee168e3f3b5dae3a8 Mon Sep 17 00:00:00 2001
+From: Dean Nelson <dnelson@redhat.com>
+Date: Mon, 29 Mar 2010 22:03:00 +0200
+Subject: hwmon: (coretemp) Add missing newline to dev_warn() message
+
+From: Dean Nelson <dnelson@redhat.com>
+
+commit 4d7a5644e4adfafe76c2bd8ee168e3f3b5dae3a8 upstream.
+
+Add missing newline to dev_warn() message string. This is more of an issue
+with older kernels that don't automatically add a newline if it was missing
+from the end of the previous line.
+
+Signed-off-by: Dean Nelson <dnelson@redhat.com>
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hwmon/coretemp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/hwmon/coretemp.c
++++ b/drivers/hwmon/coretemp.c
+@@ -191,7 +191,7 @@ static int __devinit adjust_tjmax(struct
+               if (err) {
+                       dev_warn(dev,
+                                "Unable to access MSR 0xEE, for Tjmax, left"
+-                               " at default");
++                               " at default\n");
+               } else if (eax & 0x40000000) {
+                       tjmax = 85000;
+               }

diff --git a/queue-2.6.31/series b/queue-2.6.31/series
index c2ce00855f3d4130cdf7ecbed2b2873f488928f2..c8bd727337b4536b2886c28b42dcb09fdb1e296f 100644 (file)
--- a/queue-2.6.31/series
+++ b/queue-2.6.31/series
@@ -85,3 +85,5 @@ tmpfs-handle-mpol_local-mount-option-properly.patch
 tmpfs-cleanup-mpol_parse_str.patch
 doc-add-the-documentation-for-mpol-local.patch
 usb-fix-usbfs-regression.patch
+x86-fix-placement-of-fix_ohci1394_base.patch
+hwmon-coretemp-add-missing-newline-to-dev_warn-message.patch

diff --git a/queue-2.6.31/x86-fix-placement-of-fix_ohci1394_base.patch b/queue-2.6.31/x86-fix-placement-of-fix_ohci1394_base.patch
new file mode 100644 (file)
index 0000000..ab21075
--- /dev/null
+++ b/queue-2.6.31/x86-fix-placement-of-fix_ohci1394_base.patch
@@ -0,0 +1,51 @@
+From ff30a0543e9a6cd732582063e7cae951cdb7acf2 Mon Sep 17 00:00:00 2001
+From: Jan Beulich <JBeulich@novell.com>
+Date: Mon, 15 Mar 2010 10:11:15 +0000
+Subject: x86: Fix placement of FIX_OHCI1394_BASE
+
+From: Jan Beulich <JBeulich@novell.com>
+
+commit ff30a0543e9a6cd732582063e7cae951cdb7acf2 upstream.
+
+Ever for 32-bit with sufficiently high NR_CPUS, and starting
+with commit 789d03f584484af85dbdc64935270c8e45f36ef7 also for
+64-bit, the statically allocated early fixmap page tables were
+not covering FIX_OHCI1394_BASE, leading to a boot time crash
+when "ohci1394_dma=early" was used. Despite this entry not being
+a permanently used one, it needs to be moved into the permanent
+range since it has to be close to FIX_DBGP_BASE and
+FIX_EARLYCON_MEM_BASE.
+
+Reported-bisected-and-tested-by: Justin P. Mattock <justinmattock@gmail.com>
+Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=14487
+Signed-off-by: Jan Beulich <jbeulich@novell.com>
+LKML-Reference: <4B9E15D30200007800034D23@vpn.id2.novell.com>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/x86/include/asm/fixmap.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/include/asm/fixmap.h
++++ b/arch/x86/include/asm/fixmap.h
+@@ -82,6 +82,9 @@ enum fixed_addresses {
+ #endif
+       FIX_DBGP_BASE,
+       FIX_EARLYCON_MEM_BASE,
++#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
++      FIX_OHCI1394_BASE,
++#endif
+ #ifdef CONFIG_X86_LOCAL_APIC
+       FIX_APIC_BASE,  /* local (CPU) APIC) -- required for SMP or not */
+ #endif
+@@ -126,9 +129,6 @@ enum fixed_addresses {
+       FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -
+                       (__end_of_permanent_fixed_addresses & 255),
+       FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,
+-#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
+-      FIX_OHCI1394_BASE,
+-#endif
+ #ifdef CONFIG_X86_32
+       FIX_WP_TEST,
+ #endif