summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-20 10:27:55 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-20 10:27:55 -0700
commitd2c5f06e361f18be0d7b75988ce6a9e8800a8113 (patch)
tree3e49fffc05e1d7aa1413ffcdc1dcb41521fd0875 /arch
parentc1448791648d44ecbf8cadb192704e3e6eb3bb0e (diff)
parent6cf431d77c3e917399a847e3a7ec239d5163056b (diff)
downloadop-kernel-dev-d2c5f06e361f18be0d7b75988ce6a9e8800a8113.zip
op-kernel-dev-d2c5f06e361f18be0d7b75988ce6a9e8800a8113.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Clean up asm-sparc/elf.h pollution in userspace. [SPARC64]: Fix of_ioremap(). [SPARC64]: Compute dma_end argument to sabre_pbm_init() correctly.
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/of_device.c7
-rw-r--r--arch/sparc64/kernel/pci_sabre.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index d822c7c..d3dfb2a 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -131,8 +131,13 @@ static int of_device_resume(struct device * dev)
void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name)
{
unsigned long ret = res->start + offset;
+ struct resource *r;
- if (!request_region(ret, size, name))
+ if (res->flags & IORESOURCE_MEM)
+ r = request_mem_region(ret, size, name);
+ else
+ r = request_region(ret, size, name);
+ if (!r)
ret = 0;
return (void __iomem *) ret;
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index de7f785..94bb681 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1465,5 +1465,5 @@ void sabre_init(struct device_node *dp, char *model_name)
/*
* Look for APB underneath.
*/
- sabre_pbm_init(p, dp, vdma[0], vdma[1]);
+ sabre_pbm_init(p, dp, vdma[0], vdma[0] + vdma[1]);
}
OpenPOWER on IntegriCloud