rpms/kernel/F-11 drm-modesetting-radeon.patch, 1.72, 1.73 kernel.spec, 1.1535, 1.1536 linux-2.6-acer-wmi-bail-on-aao.patch, 1.1, 1.2
Chuck Ebbert
cebbert at fedoraproject.org
Tue Apr 14 11:32:52 UTC 2009
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30311
Modified Files:
drm-modesetting-radeon.patch kernel.spec
linux-2.6-acer-wmi-bail-on-aao.patch
Log Message:
acer-wmi: use upstream code to blacklist an additional model
Trivial fix to drm-modesetting-radeon to fix failure to apply
drm-modesetting-radeon.patch:
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-modesetting-radeon.patch,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- drm-modesetting-radeon.patch 14 Apr 2009 06:04:13 -0000 1.72
+++ drm-modesetting-radeon.patch 14 Apr 2009 11:32:15 -0000 1.73
@@ -1939,7 +1939,7 @@
int __read_mostly pat_enabled = 1;
+EXPORT_SYMBOL_GPL(pat_enabled);
- void __cpuinit pat_disable(const char *reason)
+ void __cpuinit pat_disable(char *reason)
{
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 3a22eb9..a74980b 100644
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -r1.1535 -r1.1536
--- kernel.spec 14 Apr 2009 06:04:14 -0000 1.1535
+++ kernel.spec 14 Apr 2009 11:32:18 -0000 1.1536
@@ -929,8 +929,8 @@
echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing"
exit 1
fi
- done 2>/dev/null
-fi
+ done
+fi 2>/dev/null
patch_command='patch -p1 -F1 -s'
ApplyPatch()
@@ -1932,6 +1932,10 @@
# and build.
%changelog
+* Tue Apr 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- acer-wmi: use upstream code to blacklist an additional model
+- Trivial fix to drm-modesetting-radeon to fix failure to apply
+
* Tue Apr 14 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-73
- drm-modesetting-radeon.patch: more bug fixes
linux-2.6-acer-wmi-bail-on-aao.patch:
Index: linux-2.6-acer-wmi-bail-on-aao.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-acer-wmi-bail-on-aao.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-acer-wmi-bail-on-aao.patch 3 Apr 2009 19:34:05 -0000 1.1
+++ linux-2.6-acer-wmi-bail-on-aao.patch 14 Apr 2009 11:32:19 -0000 1.2
@@ -1,82 +1,66 @@
-[PATCH] acer-wmi: don't bother loading on unsupported systems
-
-Its both a waste of system resources to load this driver on unsupported
-systems (which happens often, due to the *Acer* dmi modalias wildcard),
-and actually causes problems -- we wind up with a sysfs rfkill entry
-that is always disabled, which throws things like NetworkManager for a
-loop, causing it to think your wireless card isn't available, even
-though the *real* rfkill entry for the card says it is. This is
-triggering on multiple Acer Aspire One's here in the office, like so:
-
-NetworkManager: <info> starting...
-NetworkManager: <WARN> nm_generic_enable_loopback(): error -17 returned from rtnl_addr_add():#012Sucess#012
-NetworkManager: <info> Found radio killswitch /org/freedesktop/Hal/devices/platform_acer_wmi_rfkill_acer_wireless_wlan
-NetworkManager: <info> Found radio killswitch /org/freedesktop/Hal/devices/pci_8086_423a_rfkill_5350AGN_wlan
-NetworkManager: <info> (eth0): new Ethernet device (driver: 'r8169')
-NetworkManager: <info> (eth0): exported as /org/freedesktop/Hal/devices/net_00_1e_68_8a_a1_f8
-NetworkManager: <info> (wlan0): driver supports SSID scans (scan_capa 0x01).
-NetworkManager: <info> (wlan0): new 802.11 WiFi device (driver: 'iwlagn')
-NetworkManager: <info> (wlan0): exported as /org/freedesktop/Hal/devices/net_00_16_eb_04_31_ea
-NetworkManager: <info> Trying to start the supplicant...
-NetworkManager: <info> Trying to start the system settings daemon...
-NetworkManager: <info> Wireless now disabled by radio killswitch
-NetworkManager: <info> (wlan0): supplicant manager state: down -> idle
-
-So have acer-wmi just bail on unsupported systems -- includes only my
-particular model of the Aspire One atm, but a larger list of unsupported
-systems can be found here:
-
-http://code.google.com/p/aceracpi/wiki/SupportedHardware
-
-This might well become unnecessary once the WMI sysfs interface mentioned in
-acer-wmi.c exists and the wild-card dmi modalias is gone, but for now... I
-prefer to have working wireless, and this isn't exactly an obvious root
-cause.
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
+From: Carlos Corbacho <carlos at strangeworlds.co.uk>
+Date: Sat, 4 Apr 2009 08:33:29 +0000 (+0100)
+Subject: acer-wmi: Blacklist Acer Aspire One
+X-Git-Tag: v2.6.30-rc1~199^2~15^2~2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a74dd5fdabcd34c93e17e9c7024eeb503c92b048
+
+acer-wmi: Blacklist Acer Aspire One
+
+The Aspire One's ACPI-WMI interface is a placeholder that does nothing,
+and the invalid results that we get from it are now causing userspace
+problems as acer-wmi always returns that the rfkill is enabled (i.e. the
+radio is off, when it isn't). As it's hardware controlled, acer-wmi
+isn't needed on the Aspire One either.
+
+Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace
+issues to this.
+
+Signed-off-by: Carlos Corbacho <carlos at strangeworlds.co.uk>
+Reported-by: Andy Whitcroft <apw at canonical.com>
+Cc: stable at kernel.org
+Signed-off-by: Len Brown <len.brown at intel.com>
---
- drivers/platform/x86/acer-wmi.c | 23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
-index a6a42e8..eda7eea 100644
+index a6a42e8..60fbef2 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
-@@ -355,6 +355,25 @@ static struct dmi_system_id acer_quirks[] = {
- {}
+@@ -225,6 +225,25 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
+ .wireless = 2,
};
-+static int __init acer_wmi_unsupported_callback(const struct dmi_system_id *id)
-+{
-+ printk(ACER_INFO "%s not supported by Acer Laptop ACPI-WMI Extras\n",
-+ id->ident);
-+ return 1;
-+}
-+
-+static const struct dmi_system_id __initdata acer_wmi_unsupported[] = {
++/* The Aspire One has a dummy ACPI-WMI interface - disable it */
++static struct dmi_system_id __devinitdata acer_blacklist[] = {
+ {
-+ .callback = acer_wmi_unsupported_callback,
-+ .ident = "Acer Aspire One",
++ .ident = "Acer Aspire One (SSD)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+ },
+ },
++ {
++ .ident = "Acer Aspire One (HDD)",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
++ },
++ },
+ {}
+};
+
- /* Find which quirks are needed for a particular vendor/ model pair */
- static void find_quirks(void)
- {
-@@ -1252,6 +1271,10 @@ static int __init acer_wmi_init(void)
- {
- int err;
+ static struct dmi_system_id acer_quirks[] = {
+ {
+ .callback = dmi_matched,
+@@ -1254,6 +1273,12 @@ static int __init acer_wmi_init(void)
-+ /* Check for unsupported systems and bail */
-+ if (dmi_check_system(acer_wmi_unsupported))
-+ return -ENODEV;
-+
printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
++ if (dmi_check_system(acer_blacklist)) {
++ printk(ACER_INFO "Blacklisted hardware detected - "
++ "not loading\n");
++ return -ENODEV;
++ }
++
find_quirks();
+
+ /*
More information about the scm-commits
mailing list