|
@@ -1,4 +1,4 @@
|
|
|
-From 4b6fec80690909e7a8ab733ebd56224510865677 Mon Sep 17 00:00:00 2001
|
|
|
+From 5f3edadc09a3ef67d394cbc5373f06229c993834 Mon Sep 17 00:00:00 2001
|
|
|
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
|
|
Date: Sat, 28 Sep 2019 17:48:21 +0200
|
|
|
Subject: [PATCH 05/10] suspend
|
|
@@ -266,10 +266,10 @@ index 3c68a5b35ec1b..0cc7bea4eb707 100644
|
|
|
.err_handler = &nvme_err_handler,
|
|
|
};
|
|
|
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
|
|
|
-index 6e50f84733b75..b03884b6bc6f8 100644
|
|
|
+index 279f9f0197b01..cb474338f39de 100644
|
|
|
--- a/drivers/pci/pcie/aspm.c
|
|
|
+++ b/drivers/pci/pcie/aspm.c
|
|
|
-@@ -1170,6 +1170,26 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp)
|
|
|
+@@ -1171,6 +1171,26 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp)
|
|
|
module_param_call(policy, pcie_aspm_set_policy, pcie_aspm_get_policy,
|
|
|
NULL, 0644);
|
|
|
|
|
@@ -297,10 +297,10 @@ index 6e50f84733b75..b03884b6bc6f8 100644
|
|
|
static ssize_t link_state_show(struct device *dev,
|
|
|
struct device_attribute *attr,
|
|
|
diff --git a/include/linux/pci.h b/include/linux/pci.h
|
|
|
-index b1f297f4b7b0b..94ab2fc800d30 100644
|
|
|
+index 2517492dd1855..d96343cd5c998 100644
|
|
|
--- a/include/linux/pci.h
|
|
|
+++ b/include/linux/pci.h
|
|
|
-@@ -1486,8 +1486,10 @@ extern bool pcie_ports_native;
|
|
|
+@@ -1489,8 +1489,10 @@ extern bool pcie_ports_native;
|
|
|
|
|
|
#ifdef CONFIG_PCIEASPM
|
|
|
bool pcie_aspm_support_enabled(void);
|