From: Greg Kroah-Hartman Date: Wed, 8 Feb 2012 16:38:54 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.0.21~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cd52d4c9195771775048480db4dca37c75962a0;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch hwmon-w83627ehf-fix-number-of-fans-for-nct6776f.patch lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch --- diff --git a/queue-3.0/atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch b/queue-3.0/atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch new file mode 100644 index 00000000000..fbe2c6fc7e3 --- /dev/null +++ b/queue-3.0/atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch @@ -0,0 +1,33 @@ +From 9f1065032ceb7e86c7c9f16bb86518857e88a172 Mon Sep 17 00:00:00 2001 +From: Hubert Feurstein +Date: Mon, 9 Jan 2012 17:23:57 +0100 +Subject: atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume + +From: Hubert Feurstein + +commit 9f1065032ceb7e86c7c9f16bb86518857e88a172 upstream. + +An error was existing in the saving of CONTRAST_CTR register +across suspend/resume. + +Signed-off-by: Hubert Feurstein +Signed-off-by: Nicolas Ferre +Acked-by: Jean-Christophe PLAGNIOL-VILLARD +Signed-off-by: Florian Tobias Schandinat +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/atmel_lcdfb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/atmel_lcdfb.c ++++ b/drivers/video/atmel_lcdfb.c +@@ -1085,7 +1085,7 @@ static int atmel_lcdfb_suspend(struct pl + */ + lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL); + +- sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); ++ sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR); + lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); + if (sinfo->atmel_lcdfb_power_control) + sinfo->atmel_lcdfb_power_control(0); diff --git a/queue-3.0/cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch b/queue-3.0/cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch new file mode 100644 index 00000000000..19a8d8a28d5 --- /dev/null +++ b/queue-3.0/cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch @@ -0,0 +1,44 @@ +From de47a4176c532ef5961b8a46a2d541a3517412d3 Mon Sep 17 00:00:00 2001 +From: Shirish Pargaonkar +Date: Thu, 2 Feb 2012 15:28:28 -0600 +Subject: cifs: Fix oops in session setup code for null user mounts + +From: Shirish Pargaonkar + +commit de47a4176c532ef5961b8a46a2d541a3517412d3 upstream. + +For null user mounts, do not invoke string length function +during session setup. + +Reported-and-Tested-by: Chris Clayton +Acked-by: Jeff Layton +Signed-off-by: Shirish Pargaonkar +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman + +--- + fs/cifs/sess.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/fs/cifs/sess.c ++++ b/fs/cifs/sess.c +@@ -244,16 +244,15 @@ static void ascii_ssetup_strings(char ** + /* copy user */ + /* BB what about null user mounts - check that we do this BB */ + /* copy user */ +- if (ses->user_name != NULL) ++ if (ses->user_name != NULL) { + strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE); ++ bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE); ++ } + /* else null user mount */ +- +- bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE); + *bcc_ptr = 0; + bcc_ptr++; /* account for null termination */ + + /* copy domain */ +- + if (ses->domainName != NULL) { + strncpy(bcc_ptr, ses->domainName, 256); + bcc_ptr += strnlen(ses->domainName, 256); diff --git a/queue-3.0/hwmon-w83627ehf-fix-number-of-fans-for-nct6776f.patch b/queue-3.0/hwmon-w83627ehf-fix-number-of-fans-for-nct6776f.patch new file mode 100644 index 00000000000..453a88cb8ef --- /dev/null +++ b/queue-3.0/hwmon-w83627ehf-fix-number-of-fans-for-nct6776f.patch @@ -0,0 +1,56 @@ +From 585c0fd8216e0c9f98e2434092af7ec0f999522d Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Fri, 27 Jan 2012 05:43:59 -0800 +Subject: hwmon: (w83627ehf) Fix number of fans for NCT6776F + +From: Guenter Roeck + +commit 585c0fd8216e0c9f98e2434092af7ec0f999522d upstream. + +NCT6776F can select fan input pins for fans 3 to 5 with a secondary set of +chip register bits. Check that second set of bits in addition to the first set +to detect if fans 3..5 are monitored. + +Signed-off-by: Guenter Roeck +Acked-by: Jean Delvare +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwmon/w83627ehf.c | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +--- a/drivers/hwmon/w83627ehf.c ++++ b/drivers/hwmon/w83627ehf.c +@@ -2104,9 +2104,29 @@ static int __devinit w83627ehf_probe(str + fan4min = 0; + fan5pin = 0; + } else if (sio_data->kind == nct6776) { +- fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40); +- fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01); +- fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02); ++ bool gpok = superio_inb(sio_data->sioreg, 0x27) & 0x80; ++ u8 regval; ++ ++ superio_select(sio_data->sioreg, W83627EHF_LD_HWM); ++ regval = superio_inb(sio_data->sioreg, SIO_REG_ENABLE); ++ ++ if (regval & 0x80) ++ fan3pin = gpok; ++ else ++ fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40); ++ ++ if (regval & 0x40) ++ fan4pin = gpok; ++ else ++ fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) ++ & 0x01); ++ ++ if (regval & 0x20) ++ fan5pin = gpok; ++ else ++ fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) ++ & 0x02); ++ + fan4min = fan4pin; + } else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { + fan3pin = 1; diff --git a/queue-3.0/lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch b/queue-3.0/lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch new file mode 100644 index 00000000000..919909ff204 --- /dev/null +++ b/queue-3.0/lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch @@ -0,0 +1,53 @@ +From df754e6af2f237a6c020c0daff55a1a609338e31 Mon Sep 17 00:00:00 2001 +From: Peter Zijlstra +Date: Mon, 14 Nov 2011 13:13:49 +0100 +Subject: lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep + +From: Peter Zijlstra + +commit df754e6af2f237a6c020c0daff55a1a609338e31 upstream. + +It's unlikely that TAINT_FIRMWARE_WORKAROUND causes false +lockdep messages, so do not disable lockdep in that case. +We still want to keep lockdep disabled in the +TAINT_OOT_MODULE case: + + - bin-only modules can cause various instabilities in + their and in unrelated kernel code + + - they are impossible to debug for kernel developers + + - they also typically do not have the copyright license + permission to link to the GPL-ed lockdep code. + +Suggested-by: Ben Hutchings +Signed-off-by: Peter Zijlstra +Link: http://lkml.kernel.org/n/tip-xopopjjens57r0i13qnyh2yo@git.kernel.org +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/panic.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -236,8 +236,16 @@ void add_taint(unsigned flag) + * Also we want to keep up lockdep for staging development and + * post-warning case. + */ +- if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) +- printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); ++ switch (flag) { ++ case TAINT_CRAP: ++ case TAINT_WARN: ++ case TAINT_FIRMWARE_WORKAROUND: ++ break; ++ ++ default: ++ if (__debug_locks_off()) ++ printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); ++ } + + set_bit(flag, &tainted_mask); + } diff --git a/queue-3.0/series b/queue-3.0/series index d2d75efaab7..145f5a28872 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -29,3 +29,7 @@ drm-i915-check-acthd-of-all-rings.patch drm-i915-fix-tv-out-refresh-rate.patch drm-i915-handle-3rd-pipe.patch ecryptfs-infinite-loop-due-to-overflow-in-ecryptfs_write.patch +cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch +atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch +lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch +hwmon-w83627ehf-fix-number-of-fans-for-nct6776f.patch