Attachment 162020 Details for Bug 240006 – fix ioremap/xen bug

[patch] fix ioremap/xen bug

ioremap.patch (text/plain), 1.34 KB, created by Bjorn Helgaas on 2007-08-21 23:32:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjorn Helgaas

Created: 2007-08-21 23:32:59 UTC

Size: 1.34 KB

patch

obsolete

>Preserve "size", which is used if we can't use page table mappings.
>
>Index: linux-2.6.18.ia64/arch/ia64/mm/ioremap.c
>===================================================================
>--- linux-2.6.18.ia64.orig/arch/ia64/mm/ioremap.c	2007-08-21 11:45:41.000000000 -0600
>+++ linux-2.6.18.ia64/arch/ia64/mm/ioremap.c	2007-08-21 17:11:10.000000000 -0600
>@@ -35,7 +35,7 @@
> 	pgprot_t prot;
> 	u64 attr;
> 	unsigned long gran_base, gran_size;
>-	unsigned long page_base;
>+	unsigned long page_base, page_size;
> 
> 	/*
> 	 * For things in kern_memmap, we must use the same attribute
>@@ -64,8 +64,8 @@
> 	 * instead.
> 	 */
> 	page_base = phys_addr & PAGE_MASK;
>-	size = PAGE_ALIGN(phys_addr + size) - page_base;
>-	if (efi_mem_attribute(page_base, size) & EFI_MEMORY_WB) {
>+	page_size = PAGE_ALIGN(phys_addr + size) - page_base;
>+	if (efi_mem_attribute(page_base, page_size) & EFI_MEMORY_WB) {
> 		prot = PAGE_KERNEL;
> 
> 		/*
>@@ -77,14 +77,14 @@
> 		/*
> 		 * Ok, go for it..
> 		 */
>-		area = get_vm_area(size, VM_IOREMAP);
>+		area = get_vm_area(page_size, VM_IOREMAP);
> 		if (!area)
> 			return NULL;
> 
> 		area->phys_addr = phys_addr;
> 		addr = (void __iomem *) area->addr;
> 		if (ioremap_page_range((unsigned long) addr,
>-				(unsigned long) addr + size, phys_addr, prot)) {
>+				(unsigned long) addr + page_size, phys_addr, prot)) {
> 			vunmap((void __force *) addr);
> 			return NULL;
> 		}

Actions: View | Diff

Attachments on bug 240006: 154633 | 154634 | 154635 | 154636 | 154637 | 160776 | 160777 | 160778 | 160779 | 160780 | 160812 | 161671 | 162020