diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-12 17:06:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 09:24:00 -0700 |
| commit | e31dd6e4520439ceae4753f32dd2da2c345e929a (patch) | |
| tree | fea87cfb0077135c6dcaf7849e518ee31733b0fc /arch/arm/kernel/bios32.c | |
| parent | d75fc8bbccf7c019994bcfd6255d5b56335ed21d (diff) | |
| download | kernel_samsung_crespo-e31dd6e4520439ceae4753f32dd2da2c345e929a.zip kernel_samsung_crespo-e31dd6e4520439ceae4753f32dd2da2c345e929a.tar.gz kernel_samsung_crespo-e31dd6e4520439ceae4753f32dd2da2c345e929a.tar.bz2 | |
[PATCH] 64bit resource: change pci core and arch code 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/arm/kernel/bios32.c')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 302fc14..45da06f 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -304,7 +304,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev) static void __devinit pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev) { - unsigned long offset; + resource_size_t offset; int i; for (i = 0; i < PCI_NUM_RESOURCES; i++) { @@ -634,9 +634,9 @@ char * __init pcibios_setup(char *str) * which might be mirrored at 0x0100-0x03ff.. */ void pcibios_align_resource(void *data, struct resource *res, - unsigned long size, unsigned long align) + resource_size_t size, resource_size_t align) { - unsigned long start = res->start; + resource_size_t start = res->start; if (res->flags & IORESOURCE_IO && start & 0x300) start = (start + 0x3ff) & ~0x3ff; |