From 239a368d5715d8f5b7733f9400339c2350c49369 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 24 Sep 2010 15:36:24 -0700 Subject: netbook: Correct netbook build by moving netbook configuration from moblin to meta Signed-off-by: Saul Wold --- .../linux-2.6.33-ahci-fix-oops-on-dummy-port.patch | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-ahci-fix-oops-on-dummy-port.patch (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-ahci-fix-oops-on-dummy-port.patch') diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-ahci-fix-oops-on-dummy-port.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-ahci-fix-oops-on-dummy-port.patch deleted file mode 100644 index 103c7f65a..000000000 --- a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.33-ahci-fix-oops-on-dummy-port.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Yong Wang -Date: Thu Mar 11 15:31:50 2010 +0800 -Subject: [PATCH] ahci: Fix accounting oops on dummy port - -Not all ports are implemented in AHCI mode on some machines. -If this is the case, it results in NULL pointer dereference -when doing alpm accounting. Skip such dummy ports. - -Signed-off-by: Yong Wang ---- - drivers/ata/ahci.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- a/drivers/ata/ahci.c -+++ b/drivers/ata/ahci.c -@@ -2283,8 +2283,8 @@ static ssize_t ahci_alpm_show_active(str - struct ata_port *ap = ata_shost_to_port(shost); - struct ahci_port_priv *pp; - -- if (!ap) -- return; -+ if (!ap || ata_port_is_dummy(ap)) -+ return 0; - pp = ap->private_data; - account_alpm_stats(ap); - -@@ -2298,6 +2298,8 @@ static ssize_t ahci_alpm_show_partial(st - struct ata_port *ap = ata_shost_to_port(shost); - struct ahci_port_priv *pp = ap->private_data; - -+ if (!ap || ata_port_is_dummy(ap)) -+ return 0; - account_alpm_stats(ap); - - return sprintf(buf, "%u\n", jiffies_to_msecs(pp->partial_jiffies)); -@@ -2310,6 +2312,8 @@ static ssize_t ahci_alpm_show_slumber(st - struct ata_port *ap = ata_shost_to_port(shost); - struct ahci_port_priv *pp = ap->private_data; - -+ if (!ap || ata_port_is_dummy(ap)) -+ return 0; - account_alpm_stats(ap); - - return sprintf(buf, "%u\n", jiffies_to_msecs(pp->slumber_jiffies)); -@@ -2323,6 +2327,8 @@ static ssize_t ahci_alpm_show_accounting - struct ata_port *ap = ata_shost_to_port(shost); - struct ahci_port_priv *pp = ap->private_data; - -+ if (!ap || ata_port_is_dummy(ap)) -+ return 0; - return sprintf(buf, "%u\n", pp->accounting_active); - } - -- cgit v1.2.3