summaryrefslogtreecommitdiffstats
path: root/patch-5.16-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r--patch-5.16-redhat.patch37
1 files changed, 2 insertions, 35 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index c52abf8e3..17a74b38e 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -1686,7 +1686,7 @@ index b334af8aa264..b2a0e2fc6d47 100644
{
}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 588588cfda48..5218a8c10a93 100644
+index 588588cfda48..f0b7f4661f3a 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -19,6 +19,7 @@
@@ -1701,7 +1701,7 @@ index 588588cfda48..5218a8c10a93 100644
};
ATTRIBUTE_GROUPS(pci_drv);
-+#if CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_RHEL_DIFFERENCES
+/**
+ * pci_hw_deprecated - Tell if a PCI device is deprecated
+ * @ids: array of PCI device id structures to search in
@@ -3178,36 +3178,3 @@ index c88167a414b4..e65a178ff9f4 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
-From f56e8c23f21528d48b494c2762b7d7674468273d Mon Sep 17 00:00:00 2001
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Wed, 8 Dec 2021 15:44:29 -0500
-Subject: [PATCH] drivers/pci/pci-driver.c: Fix if/ifdef typo
-
-This needs to be an ifdef, not an if.
-
-Fixes compile error:
-
-drivers/pci/pci-driver.c:299:5: warning: "CONFIG_RHEL_DIFFERENCES" is not defined, evaluates to 0 [-Wundef]
- 299 | #if CONFIG_RHEL_DIFFERENCES
-
-Signed-off-by: Prarit Bhargava <prarit@redhat.com>
----
- drivers/pci/pci-driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 5218a8c10a93..f0b7f4661f3a 100644
---- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -296,7 +296,7 @@ static struct attribute *pci_drv_attrs[] = {
- };
- ATTRIBUTE_GROUPS(pci_drv);
-
--#if CONFIG_RHEL_DIFFERENCES
-+#ifdef CONFIG_RHEL_DIFFERENCES
- /**
- * pci_hw_deprecated - Tell if a PCI device is deprecated
- * @ids: array of PCI device id structures to search in
---
-2.33.1
-