From: Greg Kroah-Hartman Date: Thu, 22 Jan 2009 22:46:19 +0000 (-0800) Subject: some .27 patches X-Git-Tag: v2.6.27.13~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1b38273324169947d70becbece24e20a21c9026;p=thirdparty%2Fkernel%2Fstable-queue.git some .27 patches --- diff --git a/queue-2.6.27/ath9k-quiet-harmless-forcexpaon-messages.patch b/queue-2.6.27/ath9k-quiet-harmless-forcexpaon-messages.patch new file mode 100644 index 00000000000..a46511372bd --- /dev/null +++ b/queue-2.6.27/ath9k-quiet-harmless-forcexpaon-messages.patch @@ -0,0 +1,38 @@ +From lrodriguez@Atheros.com Thu Jan 22 14:31:26 2009 +From: Luis R. Rodriguez +Date: Tue, 20 Jan 2009 11:42:43 -0800 +Subject: ath9k: quiet harmless ForceXPAon messages +To: Paul Hickey , , Kyle McMartin +Cc: linux-wireless@vger.kernel.org, Luis Rodriguez +Message-ID: <20090120194243.GC19581@tesla> +Content-Disposition: inline + + +From: Luis R. Rodriguez + +This is a port of one line of upstream patch +f1dc56003b23d2d5bb5a756de6b1633a76c9e697 + +The "ForceXPAon" messages on ath9k were not meant to be printed +regularly, lets quiet them as this can happen quite frequently +(scans) and will fill the logs with tons of these messages. + +Signed-off-by: Sujith +Signed-off-by: Luis R. Rodriguez +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath9k/hw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath9k/hw.c ++++ b/drivers/net/wireless/ath9k/hw.c +@@ -729,7 +729,7 @@ ath9k_hw_eeprom_set_board_values(struct + AR_AN_TOP2_LOCALBIAS, + AR_AN_TOP2_LOCALBIAS_S, + pModal->local_bias); +- DPRINTF(ah->ah_sc, ATH_DBG_ANY, "ForceXPAon: %d\n", ++ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, "ForceXPAon: %d\n", + pModal->force_xpaon); + REG_RMW_FIELD(ah, AR_PHY_XPA_CFG, AR_PHY_FORCE_XPA_CFG, + pModal->force_xpaon); diff --git a/queue-2.6.27/hwmon-vid-add-support-for-amd-family-10h-cpus.patch b/queue-2.6.27/hwmon-vid-add-support-for-amd-family-10h-cpus.patch new file mode 100644 index 00000000000..a1bad6984f2 --- /dev/null +++ b/queue-2.6.27/hwmon-vid-add-support-for-amd-family-10h-cpus.patch @@ -0,0 +1,30 @@ +From 1b871826b3dfcdcd78140d17c00e452eec6c12a4 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Sun, 26 Oct 2008 17:04:39 +0100 +Subject: hwmon-vid: Add support for AMD family 10h CPUs + +From: Jean Delvare + +commit 1b871826b3dfcdcd78140d17c00e452eec6c12a4 upstream. + +The AMD family 10h CPUs use the same VID decoding table as the family +0Fh CPUs. + +Signed-off-by: Jean Delvare +Cc: Rudolf Marek +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwmon/hwmon-vid.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/hwmon/hwmon-vid.c ++++ b/drivers/hwmon/hwmon-vid.c +@@ -180,6 +180,7 @@ static struct vrm_model vrm_models[] = { + {X86_VENDOR_AMD, 0x6, ANY, ANY, 90}, /* Athlon Duron etc */ + {X86_VENDOR_AMD, 0xF, 0x3F, ANY, 24}, /* Athlon 64, Opteron */ + {X86_VENDOR_AMD, 0xF, ANY, ANY, 25}, /* NPT family 0Fh */ ++ {X86_VENDOR_AMD, 0x10, ANY, ANY, 25}, /* NPT family 10h */ + {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13}, /* Pentium M (130 nm) */ + {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85}, /* Tualatin */ + {X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13}, /* Pentium M (90 nm) */ diff --git a/queue-2.6.27/series b/queue-2.6.27/series index de2ea4fc457..83b65bd7a1e 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -20,3 +20,5 @@ rt2x00-add-usb-id-for-the-linksys-wusb200.patch security-introduce-missing-kfree.patch sgi-xp-eliminate-false-detection-of-no-heartbeat.patch clocksource-introduce-clocksource_forward_now.patch +hwmon-vid-add-support-for-amd-family-10h-cpus.patch +ath9k-quiet-harmless-forcexpaon-messages.patch