diff --git a/[refs] b/[refs] index ed20243d9a01..c8a05fa785ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e24b90b282d73c0654c716d449d91a07ebb8ecaf +refs/heads/master: 901b04450a0ff44d579158b8b0492ce7e66cd442 diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu index 3c57033e2211..6443c6f038e8 100644 --- a/trunk/arch/x86/Kconfig.cpu +++ b/trunk/arch/x86/Kconfig.cpu @@ -303,7 +303,6 @@ config X86_GENERIC config X86_INTERNODE_CACHE_SHIFT int default "12" if X86_VSMP - default "7" if NUMA default X86_L1_CACHE_SHIFT config X86_CMPXCHG