Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / include / asm / global_data.h

diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index dcfa0985b5b2705df07c1b4ed5e7a26ec086877f..77d2653e27a1002a7afcccaf4513d987570294b4 100644 (file)
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -38,10 +38,11 @@ struct arch_global_data {
        unsigned long long timer_reset_value;
 #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
        unsigned long tlb_addr;
-#if defined(CONFIG_SYS_FULL_VA)
-       unsigned long pmd_addr[CONFIG_SYS_PTL1_ENTRIES];
-#endif
        unsigned long tlb_size;
+#if defined(CONFIG_ARM64)
+       unsigned long tlb_fillptr;
+       unsigned long tlb_emerg;
+#endif
 #endif
 
 #ifdef CONFIG_OMAP_COMMON