From 85b8c029555eb2d3cf22f873575ae5393538f650 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Wed, 20 Oct 2010 15:55:35 -0700
Subject: [PATCH] --- yaml --- r: 212071 b: refs/heads/master c:
 66f2b061546974b96b7b238a92ce89a87ecf0754 h: refs/heads/master i:   212069:
 01dbbf40363e44f5d8fe9ae707c7e436dfe9669c   212067:
 f4c11957c1d694cb8f00602ec52950cf774932d8   212063:
 7da5ab08ef297d490149b7ed5cf5a0706ee069cd v: v3

---
 [refs]                 | 2 +-
 trunk/arch/x86/Kconfig | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0fbb57fe2f02..c23bef0edc5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 932967202182743c01a2eee4bdfa2c42697bc586
+refs/heads/master: 66f2b061546974b96b7b238a92ce89a87ecf0754
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index cea0cd9a316f..2924f4e77791 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1148,6 +1148,9 @@ config X86_PAE
 config ARCH_PHYS_ADDR_T_64BIT
 	def_bool X86_64 || X86_PAE
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool X86_64 || HIGHMEM64G
+
 config DIRECT_GBPAGES
 	bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
 	default y