diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-18 20:55:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-18 20:55:41 -0800 |
| commit | d790be3863b28fd22e0781c1a3ddefcbfd5f7086 (patch) | |
| tree | 56a9f83b66f336df73ff81d13a14a2d63ed4c0db /include/trace | |
| parent | 64ec45bff6b3dade2643ed4c0f688a15ecf46ea2 (diff) | |
| parent | b0a65b0cccd477b2fd8b7adad0ac39433df54829 (diff) | |
| download | linux-d790be3863b28fd22e0781c1a3ddefcbfd5f7086.tar.bz2 | |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell:
"The exciting thing here is the getting rid of stop_machine on module
removal. This is possible by using a simple atomic_t for the counter,
rather than our fancy per-cpu counter: it turns out that no one is
doing a module increment per net packet, so the slowdown should be in
the noise"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
param: do not set store func without write perm
params: cleanup sysfs allocation
kernel:module Fix coding style errors and warnings.
module: Remove stop_machine from module unloading
module: Replace module_ref with atomic_t refcnt
lib/bug: Use RCU list ops for module_bug_list
module: Unlink module with RCU synchronizing instead of stop_machine
module: Wait for RCU synchronizing before releasing a module
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/module.h b/include/trace/events/module.h index 7c5cbfe3fc49..81c4c183d348 100644 --- a/include/trace/events/module.h +++ b/include/trace/events/module.h @@ -80,7 +80,7 @@ DECLARE_EVENT_CLASS(module_refcnt, TP_fast_assign( __entry->ip = ip; - __entry->refcnt = __this_cpu_read(mod->refptr->incs) - __this_cpu_read(mod->refptr->decs); + __entry->refcnt = atomic_read(&mod->refcnt); __assign_str(name, mod->name); ), |