diff --git a/[refs] b/[refs] index 7e4af91ebbc1..35f982ede460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6805ab6daa2b589fe3242d05ddc47a9dbb0c4eb1 +refs/heads/master: 4f4d7a9ba0b7cdbc518cc04930323b15411eee14 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 6a47bb22657f..18f74ed11c63 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -192,9 +192,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK config NEED_PER_CPU_PAGE_FIRST_CHUNK def_bool y -config HAVE_CPUMASK_OF_CPU_MAP - def_bool X86_64_SMP - config ARCH_HIBERNATION_POSSIBLE def_bool y