diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
| commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
| tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /include/asm-arm/memory.h | |
| parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) | |
| download | kernel_samsung_smdk4412-783e3385a134305d49d7b431df6e591265e7ec14.tar.gz kernel_samsung_smdk4412-783e3385a134305d49d7b431df6e591265e7ec14.tar.bz2 kernel_samsung_smdk4412-783e3385a134305d49d7b431df6e591265e7ec14.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/asm-arm/memory.h')
| -rw-r--r-- | include/asm-arm/memory.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index a547ee598c6..3e572364ee7 100644 --- a/include/asm-arm/memory.h +++ b/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 |