kernel: Import a couple of patches.

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 92d765d4541276b1943e6470a834b85bd319f18f..d9e90d4d26b0844b159c92dcd5a370d73ef4802b 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.0.4
-release    = 7
+release    = 8
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/patches/linux-2.6-defaults-acpi-video.patch b/kernel/patches/linux-2.6-defaults-acpi-video.patch
new file mode 100644 (file)
index 0000000..af883b0
--- /dev/null
+++ b/kernel/patches/linux-2.6-defaults-acpi-video.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index d8d7596..a1b7117 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -71,7 +71,7 @@ MODULE_AUTHOR("Bruno Ducrot");
+ MODULE_DESCRIPTION("ACPI Video Driver");
+ MODULE_LICENSE("GPL");
+ 
+-static int brightness_switch_enabled = 1;
++static int brightness_switch_enabled = 0;
+ module_param(brightness_switch_enabled, bool, 0644);
+ 
+ static int acpi_video_bus_add(struct acpi_device *device);

diff --git a/kernel/patches/linux-2.6-defaults-aspm.patch b/kernel/patches/linux-2.6-defaults-aspm.patch
new file mode 100644 (file)
index 0000000..49b832d
--- /dev/null
+++ b/kernel/patches/linux-2.6-defaults-aspm.patch
@@ -0,0 +1,12 @@
+diff -up linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg linux-2.6.30.noarch/drivers/pci/pcie/aspm.c
+--- linux-2.6.30.noarch/drivers/pci/pcie/aspm.c.mjg    2009-07-16 22:01:11.000000000 +0100
++++ linux-2.6.30.noarch/drivers/pci/pcie/aspm.c        2009-07-16 22:01:30.000000000 +0100
+@@ -65,7 +65,7 @@ static LIST_HEAD(link_list);
+ #define POLICY_DEFAULT 0      /* BIOS default setting */
+ #define POLICY_PERFORMANCE 1  /* high performance */
+ #define POLICY_POWERSAVE 2    /* high power saving */
+-static int aspm_policy;
++static int aspm_policy = POLICY_POWERSAVE;
+ static const char *policy_str[] = {
+       [POLICY_DEFAULT] = "default",
+       [POLICY_PERFORMANCE] = "performance",

diff --git a/kernel/patches/linux-2.6-input-kill-stupid-messages.patch b/kernel/patches/linux-2.6-input-kill-stupid-messages.patch
new file mode 100644 (file)
index 0000000..cc1dd74
--- /dev/null
+++ b/kernel/patches/linux-2.6-input-kill-stupid-messages.patch
@@ -0,0 +1,32 @@
+From b2c6d55b2351152696aafb8c9bf3ec8968acf77c Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@phobos.i.jkkm.org>
+Date: Mon, 29 Mar 2010 23:59:58 -0400
+Subject: linux-2.6-input-kill-stupid-messages
+
+---
+ drivers/input/keyboard/atkbd.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
+index d358ef8..38db098 100644
+--- a/drivers/input/keyboard/atkbd.c
++++ b/drivers/input/keyboard/atkbd.c
+@@ -425,11 +426,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
+               goto out;
+       case ATKBD_RET_ACK:
+       case ATKBD_RET_NAK:
++#if 0
++              /* Quite a few key switchers and other tools trigger this
++               * and it confuses people who can do nothing about it */
+               if (printk_ratelimit())
+                       dev_warn(&serio->dev,
+                                "Spurious %s on %s. "
+                                "Some program might be trying access hardware directly.\n",
+                                data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
++#endif
+               goto out;
+       case ATKBD_RET_ERR:
+               atkbd->err_count++;
+-- 
+1.7.0.1
+

diff --git a/kernel/patches/linux-2.6-silence-acpi-blacklist.patch b/kernel/patches/linux-2.6-silence-acpi-blacklist.patch
new file mode 100644 (file)
index 0000000..c5997bb
--- /dev/null
+++ b/kernel/patches/linux-2.6-silence-acpi-blacklist.patch
@@ -0,0 +1,25 @@
+diff -up linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx linux-2.6.26.noarch/drivers/acpi/blacklist.c
+--- linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx    2008-07-13 17:51:29.000000000 -0400
++++ linux-2.6.26.noarch/drivers/acpi/blacklist.c       2008-08-12 14:21:39.000000000 -0400
+@@ -81,18 +81,18 @@ static int __init blacklist_by_year(void
+ 
+       /* Doesn't exist? Likely an old system */
+       if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {
+-              printk(KERN_ERR PREFIX "no DMI BIOS year, "
++              printk(KERN_INFO PREFIX "no DMI BIOS year, "
+                       "acpi=force is required to enable ACPI\n" );
+               return 1;
+       }
+       /* 0? Likely a buggy new BIOS */
+       if (year == 0) {
+-              printk(KERN_ERR PREFIX "DMI BIOS year==0, "
++              printk(KERN_INFO PREFIX "DMI BIOS year==0, "
+                       "assuming ACPI-capable machine\n" );
+               return 0;
+       }
+       if (year < CONFIG_ACPI_BLACKLIST_YEAR) {
+-              printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "
++              printk(KERN_INFO PREFIX "BIOS age (%d) fails cutoff (%d), "
+                      "acpi=force is required to enable ACPI\n",
+                      year, CONFIG_ACPI_BLACKLIST_YEAR);
+               return 1;

diff --git a/kernel/patches/linux-2.6-silence-fbcon-logo.patch b/kernel/patches/linux-2.6-silence-fbcon-logo.patch
new file mode 100644 (file)
index 0000000..45ab733
--- /dev/null
+++ b/kernel/patches/linux-2.6-silence-fbcon-logo.patch
@@ -0,0 +1,42 @@
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 1657b96..4c5c2be 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
+               kfree(save);
+       }
+ 
+-      if (logo_lines > vc->vc_bottom) {
+-              logo_shown = FBCON_LOGO_CANSHOW;
+-              printk(KERN_INFO
+-                     "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
+-      } else if (logo_shown != FBCON_LOGO_DONTSHOW) {
+-              logo_shown = FBCON_LOGO_DRAW;
+-              vc->vc_top = logo_lines;
++      if (logo_shown != FBCON_LOGO_DONTSHOW) {
++              if (logo_lines > vc->vc_bottom) {
++                      logo_shown = FBCON_LOGO_CANSHOW;
++                      printk(KERN_INFO
++                             "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
++              } else {
++                      logo_shown = FBCON_LOGO_DRAW;
++                      vc->vc_top = logo_lines;
++              }
+       }
+ }
+ #endif /* MODULE */
+@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void)
+       return 0;
+ }
+ 
++static int __init quiet_logo(char *str)
++{
++      logo_shown = FBCON_LOGO_DONTSHOW;
++      return 0;
++}
++
++early_param("quiet", quiet_logo);
++
+ module_init(fb_console_init);
+ 
+ #ifdef MODULE

diff --git a/kernel/patches/linux-2.6.30-no-pcspkr-modalias.patch b/kernel/patches/linux-2.6.30-no-pcspkr-modalias.patch
new file mode 100644 (file)
index 0000000..439269c
--- /dev/null
+++ b/kernel/patches/linux-2.6.30-no-pcspkr-modalias.patch
@@ -0,0 +1,12 @@
+diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
+index 34f4d2e..3e40c70 100644
+--- a/drivers/input/misc/pcspkr.c
++++ b/drivers/input/misc/pcspkr.c
+@@ -24,7 +24,6 @@
+ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
+ MODULE_DESCRIPTION("PC Speaker beeper driver");
+ MODULE_LICENSE("GPL");
+-MODULE_ALIAS("platform:pcspkr");
+ 
+ static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+ {