diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 06:47:04 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 06:47:04 +0900 |
| commit | 977b55cf988b86cdc929fef730a78aca98a8ebdb (patch) | |
| tree | 90f2c6b53356f453cfe337e7888bd1c6d859741f /include | |
| parent | fe696b47eb061f47559ce7394d517cfb85af50f5 (diff) | |
| parent | 37448adfc7ce0d6d5892b87aa8d57edde4126f49 (diff) | |
| download | linux-977b55cf988b86cdc929fef730a78aca98a8ebdb.tar.bz2 | |
Merge tag 'please-pull-aertracefix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull aer error logging fix from Tony Luck:
"Can't call pci_get_domain_bus_and_slot() from interupt context"
* tag 'please-pull-aertracefix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
aerdrv: Move cper_print_aer() call out of interrupt context
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/aer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/aer.h b/include/linux/aer.h index ec10e1b24c1c..737f90ab4b62 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -49,10 +49,11 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) } #endif -extern void cper_print_aer(const char *prefix, struct pci_dev *dev, +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); + int severity, + struct aer_capability_regs *aer_regs); #endif //_AER_H_ |