diff options
-rw-r--r-- | arch/powerpc/kernel/eeh_cache.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c index eeabeabea49c..a1e86e172e3c 100644 --- a/arch/powerpc/kernel/eeh_cache.c +++ b/arch/powerpc/kernel/eeh_cache.c | |||
@@ -48,11 +48,11 @@ | |||
48 | */ | 48 | */ |
49 | struct pci_io_addr_range { | 49 | struct pci_io_addr_range { |
50 | struct rb_node rb_node; | 50 | struct rb_node rb_node; |
51 | unsigned long addr_lo; | 51 | resource_size_t addr_lo; |
52 | unsigned long addr_hi; | 52 | resource_size_t addr_hi; |
53 | struct eeh_dev *edev; | 53 | struct eeh_dev *edev; |
54 | struct pci_dev *pcidev; | 54 | struct pci_dev *pcidev; |
55 | unsigned int flags; | 55 | unsigned long flags; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static struct pci_io_addr_cache { | 58 | static struct pci_io_addr_cache { |
@@ -125,8 +125,8 @@ static void eeh_addr_cache_print(struct pci_io_addr_cache *cache) | |||
125 | 125 | ||
126 | /* Insert address range into the rb tree. */ | 126 | /* Insert address range into the rb tree. */ |
127 | static struct pci_io_addr_range * | 127 | static struct pci_io_addr_range * |
128 | eeh_addr_cache_insert(struct pci_dev *dev, unsigned long alo, | 128 | eeh_addr_cache_insert(struct pci_dev *dev, resource_size_t alo, |
129 | unsigned long ahi, unsigned int flags) | 129 | resource_size_t ahi, unsigned long flags) |
130 | { | 130 | { |
131 | struct rb_node **p = &pci_io_addr_cache_root.rb_root.rb_node; | 131 | struct rb_node **p = &pci_io_addr_cache_root.rb_root.rb_node; |
132 | struct rb_node *parent = NULL; | 132 | struct rb_node *parent = NULL; |
@@ -197,9 +197,9 @@ static void __eeh_addr_cache_insert_dev(struct pci_dev *dev) | |||
197 | 197 | ||
198 | /* Walk resources on this device, poke them into the tree */ | 198 | /* Walk resources on this device, poke them into the tree */ |
199 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { | 199 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { |
200 | unsigned long start = pci_resource_start(dev,i); | 200 | resource_size_t start = pci_resource_start(dev,i); |
201 | unsigned long end = pci_resource_end(dev,i); | 201 | resource_size_t end = pci_resource_end(dev,i); |
202 | unsigned int flags = pci_resource_flags(dev,i); | 202 | unsigned long flags = pci_resource_flags(dev,i); |
203 | 203 | ||
204 | /* We are interested only bus addresses, not dma or other stuff */ | 204 | /* We are interested only bus addresses, not dma or other stuff */ |
205 | if (0 == (flags & (IORESOURCE_IO | IORESOURCE_MEM))) | 205 | if (0 == (flags & (IORESOURCE_IO | IORESOURCE_MEM))) |