diff --git a/[refs] b/[refs] index 4eee7f4d19ba..6eb306974355 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ea3038648da400cd3412925ff453041a7bd38d3 +refs/heads/master: 01b35ab7230cd6244318c9d5fb7daddb4b0d6d2e diff --git a/trunk/arch/x86/um/Kconfig b/trunk/arch/x86/um/Kconfig index 53c90fd412d1..21a13ce1d751 100644 --- a/trunk/arch/x86/um/Kconfig +++ b/trunk/arch/x86/um/Kconfig @@ -37,9 +37,8 @@ config RWSEM_GENERIC_SPINLOCK def_bool !RWSEM_XCHGADD_ALGORITHM config 3_LEVEL_PGTABLES - bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT + bool "Three-level pagetables" if !64BIT default 64BIT - depends on EXPERIMENTAL help Three-level pagetables will let UML have more than 4G of physical memory. All the memory that can't be mapped directly will be treated