lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Browse Source 
Pull two more small regmap fixes from Mark Brown:
 - Now we have users for it that aren't running Android it turns out
   that regcache_sync_region() is much more useful to drivers if it's
   exported for use by modules.  Who knew?
 - Make sure we don't divide by zero when doing debugfs dumps of
   rbtrees, not visible up until now because everything was providing at
   least some cache on startup.

* tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: prevent division by zero in rbtree_show
  regmap: Export regcache_sync_region()
This commit is contained in:
Linus Torvalds
2012-04-07 09:56:00 -07:00
parent a3fac08085 c04c1b9ee8
commit f4e52e7ffd
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/base/regmap/regcache-rbtree.c
View File

@@ -138,6 +138,7 @@ static int rbtree_show(struct seq_file *s, void *ignored)
unsigned int base, top; unsigned int base, top;
int nodes = 0; int nodes = 0;
int registers = 0; int registers = 0;
int average;
mutex_lock(&map->lock); mutex_lock(&map->lock);
@@ -152,8 +153,13 @@ static int rbtree_show(struct seq_file *s, void *ignored)
registers += top - base + 1; registers += top - base + 1;
} }
if (nodes)
average = registers / nodes;
else
average = 0;
seq_printf(s, "%d nodes, %d registers, average %d registers\n", seq_printf(s, "%d nodes, %d registers, average %d registers\n",
nodes, registers, registers / nodes); nodes, registers, average);
mutex_unlock(&map->lock); mutex_unlock(&map->lock);

1
drivers/base/regmap/regcache.c
View File

@@ -346,6 +346,7 @@ out:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(regcache_sync_region);
/** /**
* regcache_cache_only: Put a register map into cache only mode * regcache_cache_only: Put a register map into cache only mode