From d443f6564c3b908d9873851b6c5822dd7bdb7a33 Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Sat, 3 Mar 2012 19:27:27 +0800 Subject: [PATCH] --- yaml --- r: 292711 b: refs/heads/master c: 901b04450a0ff44d579158b8b0492ce7e66cd442 h: refs/heads/master i: 292709: 7bb330cbd6f26c2be98601dc6256ffafb59e2fe2 292707: 3a1f08d138b4607313587fe4469dbff117a16888 292703: 1d36f1d42ac6614ffe276b873c14cd5dd197aa72 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig.cpu | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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