From 22cb71f63cb65e9723812412ab7f4b3df7ff09e8 Mon Sep 17 00:00:00 2001 From: Hiroki Kaminaga Date: Mon, 5 Dec 2005 10:55:00 +0000 Subject: [PATCH] --- yaml --- r: 15056 b: refs/heads/master c: 31a5539e57fa80e877a2f180cd4ec9ce9de6fea0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/memory.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d1d186be1f01..723a707fd248 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0d95af5c28666155ad4c85a63a5065436ae1d79 +refs/heads/master: 31a5539e57fa80e877a2f180cd4ec9ce9de6fea0 diff --git a/trunk/include/asm-arm/memory.h b/trunk/include/asm-arm/memory.h index a547ee598c6c..3e572364ee73 100644 --- a/trunk/include/asm-arm/memory.h +++ b/trunk/include/asm-arm/memory.h @@ -122,6 +122,7 @@ static inline void *phys_to_virt(unsigned long x) */ #define __pa(x) __virt_to_phys((unsigned long)(x)) #define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) +#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) /* * Virtual <-> DMA view memory address translations