Commit e31dd6e4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d75fc8bb

arch/alpha/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -124,12 +124,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final); 


void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

		       resource_size_t size, resource_size_t align)

{

	struct pci_dev *dev = data;

	struct pci_controller *hose = dev->sysdata;

	unsigned long alignto;

	unsigned long start = res->start;

	resource_size_t start = res->start;



	if (res->flags & IORESOURCE_IO) {

		/* Make sure we start at our min on all hoses */

arch/arm/kernel/bios32.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

arch/cris/arch-v32/drivers/pci/bios.c

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 


void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

		       resource_size_t size, resource_size_t align)

{

	if (res->flags & IORESOURCE_IO) {

		unsigned long start = res->start;

		resource_size_t start = res->start;



		if (start & 0x300) {

			start = (start + 0x3ff) & ~0x3ff;

arch/frv/mb93090-mb00/pci-frv.c

+2 −2
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root, 
 */

void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

		       resource_size_t size, resource_size_t align)

{

	if (res->flags & IORESOURCE_IO) {

		unsigned long start = res->start;

		resource_size_t start = res->start;



		if (start & 0x300) {

			start = (start + 0x3ff) & ~0x3ff;

arch/i386/pci/i386.c

+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ 
 */

void

pcibios_align_resource(void *data, struct resource *res,

		       unsigned long size, unsigned long align)

			resource_size_t size, resource_size_t align)

{

	if (res->flags & IORESOURCE_IO) {

		unsigned long start = res->start;

		resource_size_t start = res->start;



		if (start & 0x300) {

			start = (start + 0x3ff) & ~0x3ff;