xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the enabling by default of ARM_PATCH_PHYS_VIRT

Browse Source 
Conflicts:
	arch/arm/mach-msm/board-msm7x30.c
This commit is contained in:
Nicolas Pitre
2011-08-29 15:29:00 -04:00
committed by Nicolas Pitre
parent ad30a2bbdc daece59689
commit 96f90c7915
9 changed files with 95 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/include/asm/memory.h
View File

@@ -151,7 +151,6 @@
* so that all we need to do is modify the 8-bit constant field.
*/
#define __PV_BITS_31_24 0x81000000
#define __PV_BITS_23_16 0x00810000
extern unsigned long __pv_phys_offset;
#define PHYS_OFFSET __pv_phys_offset
@@ -169,9 +168,6 @@ static inline unsigned long __virt_to_phys(unsigned long x)
{
unsigned long t;
__pv_stub(x, t, "add", __PV_BITS_31_24);
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
__pv_stub(t, t, "add", __PV_BITS_23_16);
#endif
return t;
}
@@ -179,9 +175,6 @@ static inline unsigned long __phys_to_virt(unsigned long x)
{
unsigned long t;
__pv_stub(x, t, "sub", __PV_BITS_31_24);
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
__pv_stub(t, t, "sub", __PV_BITS_23_16);
#endif
return t;
}
#else