The patch titled
fux-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc update
has been removed from the -mm tree. Its filename is
fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc-update.patch
This patch was dropped because it was folded into fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc.patch
------------------------------------------------------
Subject: fux-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc update
From: "Zhang, Yanmin" <yanmin_zhang@xxxxxxxxxxxxxxx>
Here is the new patch which changes PCIEAER to depend on both PCIEPORTBUS
and ACPI.
Signed-off-by: Zhang Yanmin <yanmin.zhang@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Tom Long Nguyen <tom.l.nguyen@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pci/pcie/aer/Makefile | 6 ++----
drivers/pci/pcie/aer/aerdrv.h | 10 ----------
2 files changed, 2 insertions(+), 14 deletions(-)
diff -puN drivers/pci/pcie/aer/Makefile~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc-update drivers/pci/pcie/aer/Makefile
--- a/drivers/pci/pcie/aer/Makefile~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc-update
+++ a/drivers/pci/pcie/aer/Makefile
@@ -2,9 +2,7 @@
# Makefile for PCI-Express Root Port Advanced Error Reporting Driver
#
-obj-$(CONFIG_PCIEAER) += aerdriver.o
-aerdrv_acpi-$(CONFIG_ACPI) += aerdrv_acpi.o
+obj-$(CONFIG_PCIEAER) += aerdriver.o
-aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o
-aerdriver-objs += $(aerdrv_acpi-y)
+aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o aerdrv_acpi.o
diff -puN drivers/pci/pcie/aer/aerdrv.h~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc-update drivers/pci/pcie/aer/aerdrv.h
--- a/drivers/pci/pcie/aer/aerdrv.h~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc-update
+++ a/drivers/pci/pcie/aer/aerdrv.h
@@ -18,11 +18,6 @@
#define AER_ERROR_MASK 0x001fffff
#define AER_ERROR(d) (d & AER_ERROR_MASK)
-#define VERBOSE_LIMIT_DISPLAY 1
-#define VERBOSE_FULL_DISPLAY 2
-#define VERBOSE_RAW_DISPLAY 3
-#define VERBOSE_MASK 0x3
-
#define OSC_METHOD_RUN_SUCCESS 0
#define OSC_METHOD_NOT_SUPPORTED 1
#define OSC_METHOD_RUN_FAILURE 2
@@ -125,11 +120,6 @@ extern void aer_delete_rootport(struct a
extern int aer_init(struct pcie_device *dev);
extern void aer_isr(void *context);
extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
-
-#ifdef CONFIG_ACPI
extern int aer_osc_setup(struct pci_dev *dev);
-#else
-#define aer_osc_setup(dev) (OSC_METHOD_NOT_SUPPORTED)
-#endif
#endif //_AERDRV_H_
_
Patches currently in -mm which might be from yanmin_zhang@xxxxxxxxxxxxxxx are
ixgb-add-pci-error-recovery-callbacks.patch
fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc.patch
fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
