summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBetty Dall <betty.dall@hp.com>2013-06-06 20:10:49 +0200
committerBjorn Helgaas <bhelgaas@google.com>2013-06-06 22:34:14 +0200
commit9e50a9122f048c67a4e83916434e2e212a6f0fe2 (patch)
tree238b6a8e96867740a6543030fd0cb49490a53eb0
parentPCI/AER: Set dev->__aer_firmware_first only for matching devices (diff)
downloadlinux-9e50a9122f048c67a4e83916434e2e212a6f0fe2.tar.xz
linux-9e50a9122f048c67a4e83916434e2e212a6f0fe2.zip
PCI/AER: Move AER severity defines to aer.h
The function aer_recover_queue() is a public interface and the severity argument uses #defines that are in the private header pci/pcie/aer/aerdrv.h. This patch moves the #defines from pci/pcie/aer/aerdrv.h to include/linux/aer.h. [bhelgaas: split "remove 'extern' from declarations" to another patch] Signed-off-by: Betty Dall <betty.dall@hp.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/pcie/aer/aerdrv.h4
-rw-r--r--include/linux/aer.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index d12c77cd6991..90ea3e88041f 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -13,10 +13,6 @@
#include <linux/aer.h>
#include <linux/interrupt.h>
-#define AER_NONFATAL 0
-#define AER_FATAL 1
-#define AER_CORRECTABLE 2
-
#define SYSTEM_ERROR_INTR_ON_MESG_MASK (PCI_EXP_RTCTL_SECEE| \
PCI_EXP_RTCTL_SENFEE| \
PCI_EXP_RTCTL_SEFEE)
diff --git a/include/linux/aer.h b/include/linux/aer.h
index ec10e1b24c1c..d2cf2e4f9c2d 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -7,6 +7,10 @@
#ifndef _AER_H_
#define _AER_H_
+#define AER_NONFATAL 0
+#define AER_FATAL 1
+#define AER_CORRECTABLE 2
+
struct aer_header_log_regs {
unsigned int dw0;
unsigned int dw1;