diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 16:09:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 09:23:59 -0700 |
| commit | d75fc8bbccf7c019994bcfd6255d5b56335ed21d (patch) | |
| tree | 51eee480485d640e2b7b1efd9e98eadb683fadcd /arch/sparc | |
| parent | cf7c712c11fb881842534efe98a07f36f1c86c65 (diff) | |
| download | linux-stable-d75fc8bbccf7c019994bcfd6255d5b56335ed21d.tar.gz linux-stable-d75fc8bbccf7c019994bcfd6255d5b56335ed21d.tar.bz2 linux-stable-d75fc8bbccf7c019994bcfd6255d5b56335ed21d.zip | |
[PATCH] 64bit resource: change resource core to use resource_size_t
Based on a patch series originally from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 99d716b9507a..79d177149fdb 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -208,7 +208,7 @@ _sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz) pa &= PAGE_MASK; sparc_mapiorange(bus, pa, res->start, res->end - res->start + 1); - return (void __iomem *) (res->start + offset); + return (void __iomem *)(unsigned long)(res->start + offset); } /* @@ -325,7 +325,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) res->name = sdev->prom_name; } - return (void *)res->start; + return (void *)(unsigned long)res->start; err_noiommu: release_resource(res); |