Home Home > GIT Browse

Tools

Branches

openSUSE

Upstream

SLE

summaryrefslogtreecommitdiff
authorJiri Slaby <jslaby@suse.cz>2010-04-12 18:23:50 (GMT)
committer Jiri Slaby <jslaby@suse.cz>2010-04-12 18:53:46 (GMT)
commit7ff3b3f171cbd5b827a708734d0a10119e5d2c66 (patch) (unidiff)
treeb6a5fae1fa48d0eb3b3c378a320adc7467e94ee2
parentca35c89b7fa021c7d4259fd0484f8b73720d3a84 (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).
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.drivers/pci-express-aer-silence-_OSC.patch90
2 files changed, 47 insertions, 49 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 @@
1------------------------------------------------------------------- 1-------------------------------------------------------------------
2Mon Apr 12 20:18:48 CEST 2010 - jslaby@suse.de
3
4- patches.drivers/pci-express-aer-silence-_OSC.patch: Refresh.
5 Revert change that removed aerdriver.off=1 possibility (bnc#541560).
6
7-------------------------------------------------------------------
2Mon Apr 12 10:48:58 CEST 2010 - jbeulich@novell.com 8Mon Apr 12 10:48:58 CEST 2010 - jbeulich@novell.com
3 9
4- patches.suse/bootmem-reverse: Make __alloc_bootmem_bottomup() 10- 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>
22 drivers/pci/pci-acpi.c | 10 ++-------- 22 drivers/pci/pci-acpi.c | 10 ++--------
23 drivers/pci/pcie/aer/aerdrv.h | 2 +- 23 drivers/pci/pcie/aer/aerdrv.h | 2 +-
24 drivers/pci/pcie/aer/aerdrv_acpi.c | 32 +++++++++++++++++--------------- 24 drivers/pci/pcie/aer/aerdrv_acpi.c | 32 +++++++++++++++++---------------
25 drivers/pci/pcie/aer/aerdrv_core.c | 18 ++---------------- 25 drivers/pci/pcie/aer/aerdrv_core.c | 16 ++--------------
26 4 files changed, 22 insertions(+), 40 deletions(-) 26 4 files changed, 22 insertions(+), 38 deletions(-)
27 27
28Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv.h 28--- a/drivers/pci/pci-acpi.c
29=================================================================== 29+++ b/drivers/pci/pci-acpi.c
30 --- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pcie/aer/aerdrv.h2008-09-23 23:32:58.000000000 +0400 30@@ -53,11 +53,8 @@ acpi_query_osc (
31 +++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv.h2008-09-23 23:36:57.000000000 +0400 31 in_params[3].buffer.pointer = (u8 *)context;
32@@ -121,6 +121,6 @@ 32
33 status = acpi_evaluate_object(handle, "_OSC", &input, &output);
34 -if (ACPI_FAILURE (status)) {
35 - printk(KERN_DEBUG
36 - "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
37 +if (ACPI_FAILURE (status))
38 return status;
39 -}
40 out_obj = output.pointer;
41
42 if (out_obj->type != ACPI_TYPE_BUFFER) {
43@@ -121,11 +118,8 @@ acpi_run_osc (
44 in_params[3].buffer.pointer = (u8 *)context;
45
46 status = acpi_evaluate_object(handle, "_OSC", &input, &output);
47 -if (ACPI_FAILURE (status)) {
48 - printk(KERN_DEBUG
49 - "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
50 +if (ACPI_FAILURE (status))
51 return status;
52 -}
53 out_obj = output.pointer;
54 if (out_obj->type != ACPI_TYPE_BUFFER) {
55 printk(KERN_DEBUG
56--- a/drivers/pci/pcie/aer/aerdrv.h
57+++ b/drivers/pci/pcie/aer/aerdrv.h
58@@ -121,6 +121,6 @@ extern void aer_delete_rootport(struct a
33 extern int aer_init(struct pcie_device *dev); 59 extern int aer_init(struct pcie_device *dev);
34 extern void aer_isr(void *work); 60 extern void aer_isr(void *work);
35 extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); 61 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
37+extern int aer_osc_setup(struct pcie_device *pciedev); 63+extern int aer_osc_setup(struct pcie_device *pciedev);
38 64
39 #endif //_AERDRV_H_ 65 #endif //_AERDRV_H_
40Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_acpi.c 66--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
41=================================================================== 67+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
42 --- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pcie/aer/aerdrv_acpi.c2008-09-23 23:32:58.000000000 +0400
43 +++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_acpi.c2008-09-23 23:36:57.000000000 +0400
44@@ -27,32 +27,34 @@ 68@@ -27,32 +27,34 @@
45 * Invoked when PCIE bus loads AER service driver. To avoid conflict with 69 * Invoked when PCIE bus loads AER service driver. To avoid conflict with
46 * BIOS AER support requires BIOS to yield AER control to OS native driver. 70 * 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
91 +return 0; 115 +return 0;
92 } 116 }
93 117
94Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_core.c 118--- a/drivers/pci/pcie/aer/aerdrv_core.c
95=================================================================== 119+++ b/drivers/pci/pcie/aer/aerdrv_core.c
96 --- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pcie/aer/aerdrv_core.c2008-09-23 23:32:58.000000000 +0400 120@@ -749,22 +749,10 @@ void aer_delete_rootport(struct aer_rpc
97 +++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_core.c2008-09-23 23:36:57.000000000 +0400
98@@ -749,22 +749,8 @@
99 **/ 121 **/
100 int aer_init(struct pcie_device *dev) 122 int aer_init(struct pcie_device *dev)
101 { 123 {
102 -int status; 124 -int status;
103- 125-
104 -CHECK_AER_DISABLED(); 126 CHECK_AER_DISABLED();
105- 127
106 -/* Run _OSC Method */ 128 -/* Run _OSC Method */
107 -status = aer_osc_setup(dev->port); 129 -status = aer_osc_setup(dev->port);
108- 130-
@@ -120,33 +142,3 @@ Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pcie/aer/aerdrv_core.c
120 142
121 return AER_SUCCESS; 143 return AER_SUCCESS;
122 } 144 }
123Index: linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pci-acpi.c
124===================================================================
125 --- linux-2.6.16-SLES10_SP2_BRANCH.orig/drivers/pci/pci-acpi.c2008-09-23 23:36:43.000000000 +0400
126 +++ linux-2.6.16-SLES10_SP2_BRANCH/drivers/pci/pci-acpi.c2008-09-23 23:37:40.000000000 +0400
127@@ -53,11 +53,8 @@
128 in_params[3].buffer.pointer = (u8 *)context;
129
130 status = acpi_evaluate_object(handle, "_OSC", &input, &output);
131 -if (ACPI_FAILURE (status)) {
132 - printk(KERN_DEBUG
133 - "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
134 +if (ACPI_FAILURE (status))
135 return status;
136 -}
137 out_obj = output.pointer;
138
139 if (out_obj->type != ACPI_TYPE_BUFFER) {
140@@ -121,11 +118,8 @@
141 in_params[3].buffer.pointer = (u8 *)context;
142
143 status = acpi_evaluate_object(handle, "_OSC", &input, &output);
144 -if (ACPI_FAILURE (status)) {
145 - printk(KERN_DEBUG
146 - "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
147 +if (ACPI_FAILURE (status))
148 return status;
149 -}
150 out_obj = output.pointer;
151 if (out_obj->type != ACPI_TYPE_BUFFER) {
152 printk(KERN_DEBUG