OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
arch
/
arm
/
include
/
asm
/
memory.h
diff --git
a/arch/arm/include/asm/memory.h
b/arch/arm/include/asm/memory.h
index
3a72d69
..
6f225ac
100644
(file)
--- a/
arch/arm/include/asm/memory.h
+++ b/
arch/arm/include/asm/memory.h
@@
-275,7
+275,7
@@
static inline void *phys_to_virt(phys_addr_t x)
*/
#define __pa(x) __virt_to_phys((unsigned long)(x))
#define __va(x) ((void *)__phys_to_virt((phys_addr_t)(x)))
*/
#define __pa(x) __virt_to_phys((unsigned long)(x))
#define __va(x) ((void *)__phys_to_virt((phys_addr_t)(x)))
-#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
+#define pfn_to_kaddr(pfn) __va((p
hys_addr_t)(p
fn) << PAGE_SHIFT)
extern phys_addr_t (*arch_virt_to_idmap)(unsigned long x);
extern phys_addr_t (*arch_virt_to_idmap)(unsigned long x);