sandbox: Use correct phys_{addr, size}_t for PHYS_64BIT=y

If 64-bit physical addresses support is enabled, make sure the sandox
defines the correct types for phys_addr_t and phys_size_t.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h
index 7cd56b41474fdc9387602cfee8e65e5db5c305b4..c1a5d2af8285b879fdfd30f831d42f333c5fe913 100644 (file)
--- a/arch/sandbox/include/asm/types.h
+++ b/arch/sandbox/include/asm/types.h
@@ -18,21 +18,21 @@ typedef unsigned short umode_t;
 /*
  * Number of bits in a C 'long' on this architecture.
  */
-#ifdef CONFIG_PHYS64
+#ifdef CONFIG_PHYS_64BIT
 #define BITS_PER_LONG 64
-#else  /* CONFIG_PHYS64 */
+#else  /* CONFIG_PHYS_64BIT */
 #define BITS_PER_LONG 32
-#endif /* CONFIG_PHYS64 */
+#endif /* CONFIG_PHYS_64BIT */
 
-#ifdef CONFIG_PHYS64
+#ifdef CONFIG_PHYS_64BIT
 typedef unsigned long long dma_addr_t;
 typedef u64 phys_addr_t;
 typedef u64 phys_size_t;
-#else  /* CONFIG_PHYS64 */
+#else  /* CONFIG_PHYS_64BIT */
 typedef unsigned long dma_addr_t;
 typedef u32 phys_addr_t;
 typedef u32 phys_size_t;
-#endif /* CONFIG_PHYS64 */
+#endif /* CONFIG_PHYS_64BIT */
 
 #endif /* __KERNEL__ */