From 923ea46a6bc3d9ab2e403f9152173db56ceec896 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 5 Feb 2007 11:10:19 -0500 Subject: [PATCH] fold in removal of extra printk's (pointed out by Kumar) from pci-prevent-down_read-when-pci_devices-is-empty.patch --- ...-down_read-when-pci_devices-is-empty.patch | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/review-2.6.19/pci-prevent-down_read-when-pci_devices-is-empty.patch b/review-2.6.19/pci-prevent-down_read-when-pci_devices-is-empty.patch index 05b02653c9d..1cfffef75ba 100644 --- a/review-2.6.19/pci-prevent-down_read-when-pci_devices-is-empty.patch +++ b/review-2.6.19/pci-prevent-down_read-when-pci_devices-is-empty.patch @@ -25,16 +25,17 @@ Signed-off-by: Ard van Breemen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds +[chrisw: fold in 6a4c24ec5212 to avoid printk spamming] Signed-off-by: Chris Wright --- This is the other half of the fix for bug #7505 - drivers/pci/search.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) + drivers/pci/search.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) --- linux-2.6.19.2.orig/drivers/pci/search.c +++ linux-2.6.19.2/drivers/pci/search.c -@@ -193,6 +193,18 @@ static struct pci_dev * pci_find_subsys( +@@ -193,6 +193,15 @@ static struct pci_dev * pci_find_subsys( struct pci_dev *dev; WARN_ON(in_interrupt()); @@ -45,15 +46,12 @@ This is the other half of the fix for bug #7505 + * can cause some machines to crash. So here we detect and flag that + * situation and bail out early. + */ -+ if (unlikely(list_empty(&pci_devices))) { -+ printk(KERN_INFO "pci_find_subsys() called while pci_devices " -+ "is still empty\n"); ++ if (unlikely(list_empty(&pci_devices))) + return NULL; -+ } down_read(&pci_bus_sem); n = from ? from->global_list.next : pci_devices.next; -@@ -259,6 +271,18 @@ pci_get_subsys(unsigned int vendor, unsi +@@ -259,6 +268,15 @@ pci_get_subsys(unsigned int vendor, unsi struct pci_dev *dev; WARN_ON(in_interrupt()); @@ -64,11 +62,8 @@ This is the other half of the fix for bug #7505 + * can cause some machines to crash. So here we detect and flag that + * situation and bail out early. + */ -+ if (unlikely(list_empty(&pci_devices))) { -+ printk(KERN_NOTICE "pci_get_subsys() called while pci_devices " -+ "is still empty\n"); ++ if (unlikely(list_empty(&pci_devices))) + return NULL; -+ } down_read(&pci_bus_sem); n = from ? from->global_list.next : pci_devices.next; -- 2.47.3