Merge the enabling by default of ARM_PATCH_PHYS_VIRT

Conflicts:
	arch/arm/mach-msm/board-msm7x30.c

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x30.c
index 5a2ab6855183bfff969b3f84a60934472f1de908,d1e4cc83b1e6e1aa4d2bc5a6233a32e2fcccf20d..bb72ea0383b7bd1e9a004637f751fdade5a9ff95
--- 1/arch/arm/mach-msm/board-msm7x30.c
--- 2/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@@ -106,7 -122,9 +122,9 @@@ static void __init msm7x30_map_io(void
  }
  
  MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
 -      .boot_params = PLAT_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
+       .fixup = msm7x30_fixup,
+       .reserve = msm7x30_reserve,
        .map_io = msm7x30_map_io,
        .init_irq = msm7x30_init_irq,
        .init_machine = msm7x30_init,
@@@ -114,7 -132,9 +132,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
 -      .boot_params = PLAT_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
+       .fixup = msm7x30_fixup,
+       .reserve = msm7x30_reserve,
        .map_io = msm7x30_map_io,
        .init_irq = msm7x30_init_irq,
        .init_machine = msm7x30_init,
@@@ -122,7 -142,9 +142,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
 -      .boot_params = PLAT_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
+       .fixup = msm7x30_fixup,
+       .reserve = msm7x30_reserve,
        .map_io = msm7x30_map_io,
        .init_irq = msm7x30_init_irq,
        .init_machine = msm7x30_init,