Skip to contentSkip to conversation

linux-next: manual merge of the rr tree

PATCH New Stephen Rothwell 2 participants 2 messages Jan 9, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in arch/powerpc/kernel/sysfs.c between commit 93197a36a9c16a85fb24cf5a8639f7bf9af838a3 ("powerpc: Rewrite sysfs processor cache info code") from Linus' tree and commit 013ab448cec493262080ecc47b13e0adbcfaeccd ("cpualloc:rename-per_cpu-vars") from the rr tree.

The former moved the code modified by the latter into another file and rewrote it. This is part of the code churn that should not be happening in linux-next during the merge window. :-(

I have dropped the rr tree for today, sorry.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#1 lore raw

PATCH 1/1 cacheinfo: rename cache_dir per-cpu variable

The per_cpu__ prefix on DECLARE_PER_CPU'd variables is going away; rename cache_dir to cache_dir_pcpu.

---
 arch/powerpc/kernel/cacheinfo.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Not sure which route this should go, I assume either Rusty or Ben will take it?

arch/powerpc/kernel/cacheinfo.c +5 -5
index b33f041..bb37b1d 100644
@@ -113,7 +113,7 @@ struct cache {
 	struct cache *next_local;      /* next cache of >= level */
 };
 
-static DEFINE_PER_CPU(struct cache_dir *, cache_dir);
+static DEFINE_PER_CPU(struct cache_dir *, cache_dir_pcpu);
 
 /* traversal/modification of this list occurs only at cpu hotplug time;
  * access is serialized by cpu hotplug locking
@@ -468,9 +468,9 @@ static struct cache_dir *__cpuinit cacheinfo_create_cache_dir(unsigned int cpu_i
 
 	cache_dir->kobj = kobj;
 
-	WARN_ON_ONCE(per_cpu(cache_dir, cpu_id) != NULL);
+	WARN_ON_ONCE(per_cpu(cache_dir_pcpu, cpu_id) != NULL);
 
-	per_cpu(cache_dir, cpu_id) = cache_dir;
+	per_cpu(cache_dir_pcpu, cpu_id) = cache_dir;
 
 	return cache_dir;
 err:
@@ -820,13 +820,13 @@ void cacheinfo_cpu_offline(unsigned int cpu_id)
 
 	/* Prevent userspace from seeing inconsistent state - remove
 	 * the sysfs hierarchy first */
-	cache_dir = per_cpu(cache_dir, cpu_id);
+	cache_dir = per_cpu(cache_dir_pcpu, cpu_id);
 
 	/* careful, sysfs population may have failed */
 	if (cache_dir)
 		remove_cache_dir(cache_dir);
 
-	per_cpu(cache_dir, cpu_id) = NULL;
+	per_cpu(cache_dir_pcpu, cpu_id) = NULL;
 
 	/* clear the CPU's bit in its cache chain, possibly freeing
 	 * cache objects */