From linux-kernel-owner+greg=40kroah.com-S965040AbWD0Psg@vger.kernel.org Thu Apr 27 10:05:09 2006 From: Matthieu CASTET Subject: PCI: 64 bit resources: fix pnp sysfs interface Date: Thu, 27 Apr 2006 17:47:25 +0200 Message-ID: Hi Andrew, Le Thu, 27 Apr 2006 01:41:41 -0700, Andrew Morton a =E9crit=A0: > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17-rc2/2.6.17-rc2-mm1/ 64 bit resources core changes in ioport.h break pnp sysfs interface. A patch like this is needed. Signed-off-by: Matthieu CASTET Cc: Adam Belay Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/pnp/interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- gregkh-2.6.orig/drivers/pnp/interface.c +++ gregkh-2.6/drivers/pnp/interface.c @@ -264,7 +264,7 @@ static ssize_t pnp_show_current_resource if (pnp_port_flags(dev, i) & IORESOURCE_DISABLED) pnp_printf(buffer," disabled\n"); else - pnp_printf(buffer," 0x%lx-0x%lx\n", + pnp_printf(buffer," 0x%llx-0x%llx\n", pnp_port_start(dev, i), pnp_port_end(dev, i)); } @@ -275,7 +275,7 @@ static ssize_t pnp_show_current_resource if (pnp_mem_flags(dev, i) & IORESOURCE_DISABLED) pnp_printf(buffer," disabled\n"); else - pnp_printf(buffer," 0x%lx-0x%lx\n", + pnp_printf(buffer," 0x%llx-0x%llx\n", pnp_mem_start(dev, i), pnp_mem_end(dev, i)); } @@ -286,7 +286,7 @@ static ssize_t pnp_show_current_resource if (pnp_irq_flags(dev, i) & IORESOURCE_DISABLED) pnp_printf(buffer," disabled\n"); else - pnp_printf(buffer," %ld\n", + pnp_printf(buffer," %lld\n", pnp_irq(dev, i)); } } @@ -296,7 +296,7 @@ static ssize_t pnp_show_current_resource if (pnp_dma_flags(dev, i) & IORESOURCE_DISABLED) pnp_printf(buffer," disabled\n"); else - pnp_printf(buffer," %ld\n", + pnp_printf(buffer," %lld\n", pnp_dma(dev, i)); } }