From d6ac911962192ce27d5ca08c2c97216157214788 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 1 Oct 2008 15:30:04 +0000 Subject: [PATCH] --- yaml --- r: 114597 b: refs/heads/master c: 7c12d906f4ef690c65e60111375856640f63a545 h: refs/heads/master i: 114595: 34294e5ec31851e1d7a83842f6fce862090743d3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb815db64fa6..b620a047cfaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76c31f239ea221a6c84bd26141262a43bfe8b7f4 +refs/heads/master: 7c12d906f4ef690c65e60111375856640f63a545 diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c index 52ccfed416ad..8c0270929cc0 100644 --- a/trunk/arch/powerpc/kernel/pci-common.c +++ b/trunk/arch/powerpc/kernel/pci-common.c @@ -419,7 +419,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, struct pci_dev *pdev = NULL; struct resource *found = NULL; unsigned long prot = pgprot_val(protection); - unsigned long offset = pfn << PAGE_SHIFT; + resource_size_t offset = ((resource_size_t)pfn) << PAGE_SHIFT; int i; if (page_is_ram(pfn)) @@ -470,7 +470,8 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, enum pci_mmap_state mmap_state, int write_combine) { - resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT; + resource_size_t offset = + ((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT; struct resource *rp; int ret;