The patch titled
Clean up E7520/7320/7525 quirk printk
has been added to the -mm tree. Its filename is
clean-up-e7520-7320-7525-quirk-printk.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Clean up E7520/7320/7525 quirk printk
From: Dave Jones <davej@xxxxxxxxxx>
The printk level in this printk is bogus, as the previous printk
didn't have a terminating \n resulting in ..
Intel E7520/7320/7525 detected.<6>Disabling irq balancing and affinity
It also never printed a \n at all in the case where we didn't do
the quirk.
Change it to only make noise if it actually does something useful.
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/quirks.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/i386/kernel/quirks.c~clean-up-e7520-7320-7525-quirk-printk arch/i386/kernel/quirks.c
--- a/arch/i386/kernel/quirks.c~clean-up-e7520-7320-7525-quirk-printk
+++ a/arch/i386/kernel/quirks.c
@@ -22,8 +22,6 @@ static void __devinit quirk_intel_irqbal
if (rev > 0x9)
return;
- printk(KERN_INFO "Intel E7520/7320/7525 detected.");
-
/* enable access to config space*/
pci_read_config_byte(dev, 0xf4, &config);
pci_write_config_byte(dev, 0xf4, config|0x2);
@@ -32,7 +30,8 @@ static void __devinit quirk_intel_irqbal
raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
if (!(word & (1 << 13))) {
- printk(KERN_INFO "Disabling irq balancing and affinity\n");
+ printk(KERN_INFO "Intel E7520/7320/7525 detected. "
+ "Disabling irq balancing and affinity\n");
#ifdef CONFIG_IRQBALANCE
irqbalance_disable("");
#endif
_
Patches currently in -mm which might be from davej@xxxxxxxxxx are
clean-up-e7520-7320-7525-quirk-printk.patch
fix-empty-macros-in-acpi.patch
git-alsa.patch
git-cpufreq.patch
i386-remove-support-for-the-rise-cpu.patch
fix-up-codingstyle-in-isofs.patch
undeprecate-raw-driver.patch
fix-typo-in-prefetchh.patch
allow-softlockup-to-be-runtime-disabled.patch
add-werror-implicit-function-declaration.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
