projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d79066
)
Revert "mm: check virt_to_xxxx macro on 32bit OS [1/1]"
author
Luan Yuan
<luan.yuan@amlogic.com>
Thu, 27 Dec 2018 08:32:23 +0000
(16:32 +0800)
committer
Luan Yuan
<luan.yuan@amlogic.com>
Thu, 27 Dec 2018 08:32:23 +0000
(16:32 +0800)
This reverts commit
0d79066451f17a1fe66e8a1440c99371e58cf325
.
arch/arm/include/asm/memory.h
patch
|
blob
|
history
diff --git
a/arch/arm/include/asm/memory.h
b/arch/arm/include/asm/memory.h
index
bde40c4
..
5ecadde
100644
(file)
--- a/
arch/arm/include/asm/memory.h
+++ b/
arch/arm/include/asm/memory.h
@@
-263,16
+263,9
@@
static inline unsigned long __phys_to_virt(phys_addr_t x)
#endif
-#ifdef CONFIG_AMLOGIC_MODIFY
-#define virt_to_pfn(kaddr) \
- ({virt_check((unsigned long)kaddr); \
- ((((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT) + \
- PHYS_PFN_OFFSET); })
-#else
#define virt_to_pfn(kaddr) \
((((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT) + \
PHYS_PFN_OFFSET)
-#endif
/*
* These are *only* valid on the kernel direct mapped RAM memory.