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