x86, cacheinfo: Remove NUMA dependency
PATCH 1/1 x86, cacheinfo: Remove NUMA dependency
Hi,
this is a small fix ontop of the L3 cache index disable series from last week. It is based on tip:x86/cpu and slated for .34 too.
Please apply,
thanks.
--
Quoted 1 line
From
031c4cc06d4668c4fa6b0363e2e32c8b30afbf67Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Thu, 4 Feb 2010 12:09:07 +0100
Subject: [PATCH] x86, cacheinfo: Remove NUMA dependency
The show/store_cache_disable routines depend unnecessarily on NUMA's cpu_to_node and the disabling of cache indices breaks when !CONFIG_NUMA. Remove that dependency by using a helper which returns always the correct node id.
While at it, enable L3 Cache Index disable on revD1 Istanbuls which sport the feature too.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/kernel/cpu/intel_cacheinfo.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +3 -3
@@ -327,7 +327,7 @@ amd_check_l3_disable(int index, struct _cpuid4_info_regs *this_leaf)/* see errata #382 and #388 */ if ((boot_cpu_data.x86 ==0x10 ) && - ((boot_cpu_data.x86_model <0x9 ) || + ((boot_cpu_data.x86_model <0x8 ) || (boot_cpu_data.x86_mask <0x1 )))return ;
@@ -744,7 +744,7 @@ static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf, unsigned int index) {int cpu =cpumask_first (to_cpumask (this_leaf->shared_cpu_map)); -int node =cpu_to_node (cpu); +int node =amd_get_nb_id (cpu);struct pci_dev *dev =node_to_k8_nb_misc (node);unsigned int reg =0 ;
@@ -771,7 +771,7 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf, const char *buf, size_t count, unsigned int index) { int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map)); -int node =cpu_to_node (cpu); +int node =amd_get_nb_id (cpu);struct pci_dev *dev =node_to_k8_nb_misc (node);unsigned long val =0 ;
Signature · 9 lines
1.6.6 -- Regards/Gruss, Boris. -- Advanced Micro Devices, Inc. Operating Systems Research Center