2006-09-27 19:42:53

by Olaf Hering

Subject: pcie_portdrv_restore_config undefined without CONFIG_PM

PCI-Express AER implemetation: pcie_portdrv error handler

This patch breaks if CONFIG_PM is not enabled,
pcie_portdrv_restore_config() will be undefined.

2006-09-28 06:36:55

by Yanmin Zhang

Subject: Re: pcie_portdrv_restore_config undefined without CONFIG_PM

On Thu, 2006-09-28 at 03:42, Olaf Hering wrote:
> PCI-Express AER implemetation: pcie_portdrv error handler
>
> This patch breaks if CONFIG_PM is not enabled,
> pcie_portdrv_restore_config() will be undefined.
I move the definition of pcie_portdrv_restore_config
out of CONFIG_PM.

Below patch is against 2.6.18-mm1. Could you try it?

Signed-off-by: Zhang Yanmin <[email protected]>

---

diff -Nraup linux-2.6.18_mm1/drivers/pci/pcie/portdrv_pci.c linux-2.6.18_mm1_fix/drivers/pci/pcie/portdrv_pci.c
--- linux-2.6.18_mm1/drivers/pci/pcie/portdrv_pci.c 2006-09-29 07:19:48.000000000 -0600
+++ linux-2.6.18_mm1_fix/drivers/pci/pcie/portdrv_pci.c 2006-09-29 07:21:08.000000000 -0600
@@ -37,7 +37,6 @@ static int pcie_portdrv_save_config(stru
return pci_save_state(dev);
}

-#ifdef CONFIG_PM
static int pcie_portdrv_restore_config(struct pci_dev *dev)
{
int retval;
@@ -50,6 +49,7 @@ static int pcie_portdrv_restore_config(s
return 0;
}

+#ifdef CONFIG_PM
static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
{
int ret = pcie_port_device_suspend(dev, state);

2006-09-28 06:49:13

by Olaf Hering

Subject: Re: pcie_portdrv_restore_config undefined without CONFIG_PM

On Thu, Sep 28, Zhang, Yanmin wrote:

> On Thu, 2006-09-28 at 03:42, Olaf Hering wrote:
> > PCI-Express AER implemetation: pcie_portdrv error handler
> >
> > This patch breaks if CONFIG_PM is not enabled,
> > pcie_portdrv_restore_config() will be undefined.
> I move the definition of pcie_portdrv_restore_config
> out of CONFIG_PM.
>
> Below patch is against 2.6.18-mm1. Could you try it?

This fixes arch/powerpc/configs/cell_defconfig. Thanks.