lkml.org 
[lkml]   [2005]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.14-mm1: drivers/pci/hotplug/: namespace clashes
On Mon, Nov 07, 2005 at 09:03:49PM +0100, Adrian Bunk wrote:
> On Mon, Nov 07, 2005 at 10:41:50AM -0800, Rajesh Shah wrote:
> > On Mon, Nov 07, 2005 at 06:37:32PM +0100, Adrian Bunk wrote:
> > > ...
> > > drivers/pci/hotplug/shpchp.o: In function `get_hp_params_from_firmware':
> > > : multiple definition of `get_hp_params_from_firmware'
> > > drivers/pci/hotplug/pciehp.o:: first defined here
> > > make[3]: *** [drivers/pci/hotplug/built-in.o] Error 1
> > >
> > This patch should fix this:
> >...
>
>
> Nearly, the following is additionally required:
>

Oops, yes. I forgot to quilt add this file so this change didn't
show up in my patch but the drivers built fine when I compiled.
Thanks for fixing this.

Andrew/Greg, here's a single patch with all the changes if you
prefer this over applying the 2 patches separately:

Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>

drivers/pci/hotplug/pciehp.h | 4 ++--
drivers/pci/hotplug/pciehp_hpc.c | 2 +-
drivers/pci/hotplug/pciehprm_acpi.c | 4 ++--
drivers/pci/hotplug/pciehprm_nonacpi.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)

Index: linux-2.6.14-mm1/drivers/pci/hotplug/pciehp.h
===================================================================
--- linux-2.6.14-mm1.orig/drivers/pci/hotplug/pciehp.h
+++ linux-2.6.14-mm1/drivers/pci/hotplug/pciehp.h
@@ -191,8 +191,8 @@ extern u8 pciehp_handle_power_fault (u8
/* pci functions */
extern int pciehp_configure_device (struct slot *p_slot);
extern int pciehp_unconfigure_device (struct slot *p_slot);
-extern int get_hp_hw_control_from_firmware(struct pci_dev *dev);
-extern void get_hp_params_from_firmware(struct pci_dev *dev,
+extern int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev);
+extern void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp);


Index: linux-2.6.14-mm1/drivers/pci/hotplug/pciehp_hpc.c
===================================================================
--- linux-2.6.14-mm1.orig/drivers/pci/hotplug/pciehp_hpc.c
+++ linux-2.6.14-mm1/drivers/pci/hotplug/pciehp_hpc.c
@@ -1418,7 +1418,7 @@ int pcie_init(struct controller * ctrl,
dbg("Bypassing BIOS check for pciehp use on %s\n",
pci_name(ctrl->pci_dev));
} else {
- rc = get_hp_hw_control_from_firmware(ctrl->pci_dev);
+ rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);
if (rc)
goto abort_free_ctlr;
}
Index: linux-2.6.14-mm1/drivers/pci/hotplug/pciehprm_acpi.c
===================================================================
--- linux-2.6.14-mm1.orig/drivers/pci/hotplug/pciehprm_acpi.c
+++ linux-2.6.14-mm1/drivers/pci/hotplug/pciehprm_acpi.c
@@ -169,7 +169,7 @@ static int is_root_bridge(acpi_handle ha
return 0;
}

-int get_hp_hw_control_from_firmware(struct pci_dev *dev)
+int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
{
acpi_status status;
acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
@@ -228,7 +228,7 @@ int get_hp_hw_control_from_firmware(stru
return -1;
}

-void get_hp_params_from_firmware(struct pci_dev *dev,
+void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp)
{
acpi_status status = AE_NOT_FOUND;
Index: linux-2.6.14-mm1/drivers/pci/hotplug/pciehprm_nonacpi.c
===================================================================
--- linux-2.6.14-mm1.orig/drivers/pci/hotplug/pciehprm_nonacpi.c
+++ linux-2.6.14-mm1/drivers/pci/hotplug/pciehprm_nonacpi.c
@@ -36,13 +36,13 @@

#include "pciehp.h"

-void get_hp_params_from_firmware(struct pci_dev *dev,
+void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp)
{
return;
}

-int get_hp_hw_control_from_firmware(struct pci_dev *dev)
+int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
{
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-11-07 22:43    [W:0.185 / U:1.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site