[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090220144619.82a5f076.akpm@linux-foundation.org>
Date: Fri, 20 Feb 2009 14:46:19 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Mark Langsdorf <mark.langsdorf@....com>
Cc: linux-kernel@...r.kernel.org, mingo@...e.hu, tglx@...utronix.de,
eric@...merts.org, Stephen Rothwell <sfr@...b.auug.org.au>,
Rusty Russell <rusty@...tcorp.com.au>
Subject: Re: [PATCH][retry 2] Conform L3 Cache Index Disable to Linux
standards From: Eric Lammerts <eric@...merts.org>
On Fri, 20 Feb 2009 15:50:47 -0600
Mark Langsdorf <mark.langsdorf@....com> wrote:
> Add ABI Documentation entry and fix some /sys directory formating
> issues with the L3 Cache Index Disable feature for future AMD
> processors. __Add a check to disable it for family 0x10 models
> that do not support it yet.
This change clashes with (what I assume to be) Rusty changes in
linux-next's arch/x86/kernel/cpu/intel_cacheinfo.c:
--- /tmp/1 2009-02-20 14:41:06.000000000 -0800
+++ /tmp/2 2009-02-20 14:40:52.000000000 -0800
@@ -24,7 +24,8 @@
static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf)
{
- int node = cpu_to_node(first_cpu(this_leaf->shared_cpu_map));
+ const struct cpumask *mask = to_cpumask(this_leaf->shared_cpu_map);
+ int node = cpu_to_node(cpumask_first(mask));
struct pci_dev *dev = NULL;
ssize_t ret = 0;
int i;
@@ -58,7 +59,8 @@
store_cache_disable(struct _cpuid4_info *this_leaf, const char *buf,
size_t count)
{
- int node = cpu_to_node(first_cpu(this_leaf->shared_cpu_map));
+ const struct cpumask *mask = to_cpumask(this_leaf->shared_cpu_map);
+ int node = cpu_to_node(cpumask_first(mask));
struct pci_dev *dev = NULL;
unsigned int ret, index, val;
I think those chagnes will need to be carried forward into the new
code.
I made that change when applying this patch locally. If Ingo applies
this to his tree, Stephen gets to do the same fix for linux-next
integration.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists