diff --git a/[refs] b/[refs] index 7d5f3b1e0c17..5484c7ae9ab7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6871b76fb5197a4db28de7116baf834fa36b7bfe +refs/heads/master: 0fd707ef724a9e8b4a2ddfd3da4968c57e8614ff diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h index 7b1ca1f90283..45a2f0ab33d0 100644 --- a/trunk/include/asm-x86/processor.h +++ b/trunk/include/asm-x86/processor.h @@ -302,10 +302,6 @@ union i387_union { }; #ifdef CONFIG_X86_32 -/* - * the following now lives in the per cpu area: - * extern int cpu_llc_id[NR_CPUS]; - */ DECLARE_PER_CPU(u8, cpu_llc_id); #else DECLARE_PER_CPU(struct orig_ist, orig_ist);