Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

1 files changed, 24 insertions, 0 deletions

diff --git a/include/linux/aer.h b/include/linux/aer.h
index f7df1eefc107..8414de22a779 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -7,6 +7,28 @@
 #ifndef _AER_H_
 #define _AER_H_
 
+struct aer_header_log_regs {
+        unsigned int dw0;
+        unsigned int dw1;
+        unsigned int dw2;
+        unsigned int dw3;
+};
+
+struct aer_capability_regs {
+        u32 header;
+        u32 uncor_status;
+        u32 uncor_mask;
+        u32 uncor_severity;
+        u32 cor_status;
+        u32 cor_mask;
+        u32 cap_control;
+        struct aer_header_log_regs header_log;
+        u32 root_command;
+        u32 root_status;
+        u16 cor_err_source;
+        u16 uncor_err_source;
+};
+
 #if defined(CONFIG_PCIEAER)
 /* pci-e port driver needs this function to enable aer */
 extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
@@ -27,5 +49,7 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 }
 #endif
 
+extern void cper_print_aer(const char *prefix, int cper_severity,
+                           struct aer_capability_regs *aer);
 #endif //_AER_H_