diff --git a/[refs] b/[refs] index 38b90f54929f..3e3a7ed5dbc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cb85e803ae9f90d91e97cb3856d84b7dde51e06 +refs/heads/master: 71e76e90ef24a6f10591937a48bd76d9111f7a1c diff --git a/trunk/arch/um/Kconfig.x86 b/trunk/arch/um/Kconfig.x86 index d31ecf346b4e..c2ca26c1a796 100644 --- a/trunk/arch/um/Kconfig.x86 +++ b/trunk/arch/um/Kconfig.x86 @@ -53,9 +53,6 @@ config ARCH_HAS_SC_SIGNALS config ARCH_REUSE_HOST_VSYSCALL_AREA def_bool !64BIT -config SMP_BROKEN - def_bool 64BIT - config GENERIC_HWEIGHT def_bool y