Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index b4b1d397592b3d6435c0a503541c37d3fffcc016..49b6ccf1748253076765d2c3788b62f0fde3f250 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -759,6 +759,11 @@ void __init hyp_mode_check(void)
 void __init setup_arch(char **cmdline_p)
 {
        struct machine_desc *mdesc;
+#ifdef CONFIG_ARCH_ZYNQ
+       extern u32 _fdt_start[];
+        if (!__atags_pointer)
+               __atags_pointer = virt_to_phys(_fdt_start);
+#endif
 
        setup_processor();
        mdesc = setup_machine_fdt(__atags_pointer);