Attachment 151666 Details for Bug 234069 – use same variable names as i386

[patch] use same variable names as i386

ia64-ioremap-align (text/plain), 2.42 KB, created by Bjorn Helgaas on 2007-04-04 15:28:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjorn Helgaas

Created: 2007-04-04 15:28:08 UTC

Size: 2.42 KB

patch

obsolete

>[PATCH] ia64: rename variables to match i386
>
>No functional change, just use the same names as i386.
>
>Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
>
>Index: linux-2.6.18.ia64/arch/ia64/mm/ioremap.c
>===================================================================
>--- linux-2.6.18.ia64.orig/arch/ia64/mm/ioremap.c	2007-03-23 05:18:29.000000000 -0600
>+++ linux-2.6.18.ia64/arch/ia64/mm/ioremap.c	2007-03-23 06:44:14.000000000 -0600
>@@ -14,16 +14,16 @@
> #include <asm/meminit.h>
> 
> static inline void __iomem *
>-__ioremap (unsigned long offset, unsigned long size)
>+__ioremap (unsigned long phys_addr, unsigned long size)
> {
> #ifdef CONFIG_XEN
>-	offset = HYPERVISOR_ioremap(offset, size);
>+	offset = HYPERVISOR_ioremap(phys_addr, size);
> #endif
>-	return (void __iomem *) (__IA64_UNCACHED_OFFSET | offset);
>+	return (void __iomem *) (__IA64_UNCACHED_OFFSET | phys_addr);
> }
> 
> void __iomem *
>-ioremap (unsigned long offset, unsigned long size)
>+ioremap (unsigned long phys_addr, unsigned long size)
> {
> 	u64 attr;
> 	unsigned long gran_base, gran_size;
>@@ -33,31 +33,31 @@
> 	 * as the rest of the kernel.  For more details, see
> 	 * Documentation/ia64/aliasing.txt.
> 	 */
>-	attr = kern_mem_attribute(offset, size);
>+	attr = kern_mem_attribute(phys_addr, size);
> 	if (attr & EFI_MEMORY_WB)
>-		return (void __iomem *) phys_to_virt(offset);
>+		return (void __iomem *) phys_to_virt(phys_addr);
> 	else if (attr & EFI_MEMORY_UC)
>-		return __ioremap(offset, size);
>+		return __ioremap(phys_addr, size);
> 
> 	/*
> 	 * Some chipsets don't support UC access to memory.  If
> 	 * WB is supported for the whole granule, we prefer that.
> 	 */
>-	gran_base = GRANULEROUNDDOWN(offset);
>-	gran_size = GRANULEROUNDUP(offset + size) - gran_base;
>+	gran_base = GRANULEROUNDDOWN(phys_addr);
>+	gran_size = GRANULEROUNDUP(phys_addr + size) - gran_base;
> 	if (efi_mem_attribute(gran_base, gran_size) & EFI_MEMORY_WB)
>-		return (void __iomem *) phys_to_virt(offset);
>+		return (void __iomem *) phys_to_virt(phys_addr);
> 
>-	return __ioremap(offset, size);
>+	return __ioremap(phys_addr, size);
> }
> EXPORT_SYMBOL(ioremap);
> 
> void __iomem *
>-ioremap_nocache (unsigned long offset, unsigned long size)
>+ioremap_nocache (unsigned long phys_addr, unsigned long size)
> {
>-	if (kern_mem_attribute(offset, size) & EFI_MEMORY_WB)
>+	if (kern_mem_attribute(phys_addr, size) & EFI_MEMORY_WB)
> 		return NULL;
> 
>-	return __ioremap(offset, size);
>+	return __ioremap(phys_addr, size);
> }
> EXPORT_SYMBOL(ioremap_nocache);

Actions: View | Diff

Attachments on bug 234069: 151665 | 151666 | 151667 | 151668 | 151669