diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-28 13:57:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-28 13:57:20 +1100 |
| commit | b0d73e8972eb12ed26cc6f6405bb905cf731387a (patch) | |
| tree | 1d10fd35dbb191d2a56d3e305e96e0d2b1bc32d6 /include | |
| parent | 01814e1679d16a07255f739bddf320983532358c (diff) | |
| parent | 18eb74fa94161380c1acc9cf562cb835c4e54a25 (diff) | |
Merge remote-tracking branch 'modules/modules-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/module.h | 16 | ||||
| -rw-r--r-- | include/trace/events/module.h | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 71f282a4e307..ebfb0e153c6a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -210,20 +210,6 @@ enum module_state { MODULE_STATE_UNFORMED, /* Still setting it up. */ }; -/** - * struct module_ref - per cpu module reference counts - * @incs: number of module get on this cpu - * @decs: number of module put on this cpu - * - * We force an alignment on 8 or 16 bytes, so that alloc_percpu() - * put @incs/@decs in same cache line, with no extra memory cost, - * since alloc_percpu() is fine grained. - */ -struct module_ref { - unsigned long incs; - unsigned long decs; -} __attribute((aligned(2 * sizeof(unsigned long)))); - struct module { enum module_state state; @@ -367,7 +353,7 @@ struct module { /* Destruction function. */ void (*exit)(void); - struct module_ref __percpu *refptr; + atomic_t refcnt; #endif #ifdef CONFIG_CONSTRUCTORS 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); ), |