Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-11-01 13:51:09 +0100
committerMichal Marek <mmarek@suse.cz>2013-11-01 13:51:09 +0100
commit655cb570c514b68c692bad282b699bf4b5bbdfae (patch)
tree07a487142c7fb33b9ea87e3635a5328e7da8cd1a
parent2250e015c163a984a83f5980a963a46bbcc4edda (diff)
Revert aer_recover_queue() __GENKSYMS__ hack, add a fake symset with therpm-3.0.101-0.8
previous value instead (bnc#847721) suse-commit: 2417eb9dbf01c23f0991b3bfd6cec1255fc098d6
-rw-r--r--drivers/pci/pcie/aer/aerdrv_core.c6
-rw-r--r--include/linux/aer.h7
2 files changed, 3 insertions, 10 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index c56694c61618..5a3caddd1697 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -602,11 +602,7 @@ static DEFINE_SPINLOCK(aer_recover_ring_lock);
static DECLARE_WORK(aer_recover_work, aer_recover_work_func);
void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
- int severity
-#ifndef __GENKSYMS__
- , struct aer_capability_regs *aer_regs
-#endif
- )
+ int severity, struct aer_capability_regs *aer_regs)
{
unsigned long flags;
struct aer_recover_entry entry = {
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 52202d9cf656..3c3718e36379 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -57,10 +57,7 @@ extern void cper_print_aer(struct pci_dev *dev,
int cper_severity, struct aer_capability_regs *aer);
extern int cper_severity_to_aer(int cper_severity);
extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
- int severity
-#ifndef __GENKSYMS__
- , struct aer_capability_regs *aer_regs
-#endif
- );
+ int severity,
+ struct aer_capability_regs *aer_regs);
#endif //_AER_H_