Home| summaryrefslogtreecommitdiff |
| author | Jiri Slaby <jslaby@suse.cz> | 2010-04-12 18:23:50 (GMT) |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2010-04-12 18:53:46 (GMT) |
| commit | 7ff3b3f171cbd5b827a708734d0a10119e5d2c66 (patch) (side-by-side diff) | |
| tree | b6a5fae1fa48d0eb3b3c378a320adc7467e94ee2 | |
| parent | ca35c89b7fa021c7d4259fd0484f8b73720d3a84 (diff) | |
- patches.drivers/pci-express-aer-silence-_OSC.patch: Refresh.rpm-2.6.16.60-0.62
Revert change that removed aerdriver.off=1 possibility (bnc#541560).
| -rw-r--r-- | kernel-source.changes | 6 | ||||
| -rw-r--r-- | patches.drivers/pci-express-aer-silence-_OSC.patch | 88 |
2 files changed, 46 insertions, 48 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index c3352d4..8bd9ee3 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 12 20:18:48 CEST 2010 - jslaby@suse.de + +- patches.drivers/pci-express-aer-silence-_OSC.patch: Refresh. + Revert change that removed aerdriver.off=1 possibility (bnc#541560). + +------------------------------------------------------------------- Mon Apr 12 10:48:58 CEST 2010 - jbeulich@novell.com - patches.suse/bootmem-reverse: Make __alloc_bootmem_bottomup() diff --git a/patches.drivers/pci-express-aer-silence-_OSC.patch b/patches.drivers/pci-express-aer-silence-_OSC.patch index f52ea39..81e246a 100644 --- a/patches.drivers/pci-express-aer-silence-_OSC.patch +++ b/patches.drivers/pci-express-aer-silence-_OSC.patch @@ -22,14 +22,40 @@ Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> drivers/pci/pci-acpi.c | 10 ++-------- drivers/pci/pcie/aer/aerdrv.h | 2 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 32 +++++++++++++++++--------------- - drivers/pci/pcie/aer/aerdrv_core.c | 18 ++---------------- - 4 files changed, 22 insertions(+), 40 deletions(-) + drivers/pci/pcie/aer/aerdrv_core.c | 16 ++-------------- + 4 files changed, 22 insertions(+), 38 deletions(-) -Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv.h -=================================================================== ---- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pcie/aer/aerdrv.h 2008-09-23 23:32:58.000000000 +0400 -+++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv.h 2008-09-23 23:36:57.000000000 +0400 -@@ -121,6 +121,6 @@ +--- a/drivers/pci/pci-acpi.c ++++ b/drivers/pci/pci-acpi.c +@@ -53,11 +53,8 @@ acpi_query_osc ( + in_params[3].buffer.pointer = (u8 *)context; + + status = acpi_evaluate_object(handle, "_OSC", &input, &output); +- if (ACPI_FAILURE (status)) { +- printk(KERN_DEBUG +- "Evaluate _OSC Set fails. Status = 0x%04x\n", status); ++ if (ACPI_FAILURE (status)) + return status; +- } + out_obj = output.pointer; + + if (out_obj->type != ACPI_TYPE_BUFFER) { +@@ -121,11 +118,8 @@ acpi_run_osc ( + in_params[3].buffer.pointer = (u8 *)context; + + status = acpi_evaluate_object(handle, "_OSC", &input, &output); +- if (ACPI_FAILURE (status)) { +- printk(KERN_DEBUG +- "Evaluate _OSC Set fails. Status = 0x%04x\n", status); ++ if (ACPI_FAILURE (status)) + return status; +- } + out_obj = output.pointer; + if (out_obj->type != ACPI_TYPE_BUFFER) { + printk(KERN_DEBUG +--- a/drivers/pci/pcie/aer/aerdrv.h ++++ b/drivers/pci/pcie/aer/aerdrv.h +@@ -121,6 +121,6 @@ extern void aer_delete_rootport(struct a extern int aer_init(struct pcie_device *dev); extern void aer_isr(void *work); extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); @@ -37,10 +63,8 @@ Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv.h +extern int aer_osc_setup(struct pcie_device *pciedev); #endif //_AERDRV_H_ -Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_acpi.c -=================================================================== ---- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pcie/aer/aerdrv_acpi.c 2008-09-23 23:32:58.000000000 +0400 -+++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_acpi.c 2008-09-23 23:36:57.000000000 +0400 +--- a/drivers/pci/pcie/aer/aerdrv_acpi.c ++++ b/drivers/pci/pcie/aer/aerdrv_acpi.c @@ -27,32 +27,34 @@ * Invoked when PCIE bus loads AER service driver. To avoid conflict with * BIOS AER support requires BIOS to yield AER control to OS native driver. @@ -91,18 +115,16 @@ Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_acpi.c + return 0; } -Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_core.c -=================================================================== ---- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pcie/aer/aerdrv_core.c 2008-09-23 23:32:58.000000000 +0400 -+++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_core.c 2008-09-23 23:36:57.000000000 +0400 -@@ -749,22 +749,8 @@ +--- a/drivers/pci/pcie/aer/aerdrv_core.c ++++ b/drivers/pci/pcie/aer/aerdrv_core.c +@@ -749,22 +749,10 @@ void aer_delete_rootport(struct aer_rpc **/ int aer_init(struct pcie_device *dev) { - int status; - -- CHECK_AER_DISABLED(); -- + CHECK_AER_DISABLED(); + - /* Run _OSC Method */ - status = aer_osc_setup(dev->port); - @@ -120,33 +142,3 @@ Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_core.c return AER_SUCCESS; } -Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pci-acpi.c -=================================================================== ---- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pci-acpi.c 2008-09-23 23:36:43.000000000 +0400 -+++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pci-acpi.c 2008-09-23 23:37:40.000000000 +0400 -@@ -53,11 +53,8 @@ - in_params[3].buffer.pointer = (u8 *)context; - - status = acpi_evaluate_object(handle, "_OSC", &input, &output); -- if (ACPI_FAILURE (status)) { -- printk(KERN_DEBUG -- "Evaluate _OSC Set fails. Status = 0x%04x\n", status); -+ if (ACPI_FAILURE (status)) - return status; -- } - out_obj = output.pointer; - - if (out_obj->type != ACPI_TYPE_BUFFER) { -@@ -121,11 +118,8 @@ - in_params[3].buffer.pointer = (u8 *)context; - - status = acpi_evaluate_object(handle, "_OSC", &input, &output); -- if (ACPI_FAILURE (status)) { -- printk(KERN_DEBUG -- "Evaluate _OSC Set fails. Status = 0x%04x\n", status); -+ if (ACPI_FAILURE (status)) - return status; -- } - out_obj = output.pointer; - if (out_obj->type != ACPI_TYPE_BUFFER) { - printk(KERN_DEBUG |