diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-06 18:17:50 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-06 18:17:50 -0400 |
| commit | 3eba148d75670f61463dd3c9ef8672da8f290f36 (patch) | |
| tree | 45cb8fbda6d6ce9d73aeeac673282e37b0be2531 /include/trace | |
| parent | 057b0a7518e4b8fca26201715996d6d928a62300 (diff) | |
| parent | 4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34 (diff) | |
Merge branch 'acpi-pm' into pm-sleep
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/module.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/module.h b/include/trace/events/module.h index 11fd51b413de..7c5cbfe3fc49 100644 --- a/include/trace/events/module.h +++ b/include/trace/events/module.h | |||
| @@ -25,7 +25,7 @@ struct module; | |||
| 25 | { (1UL << TAINT_OOT_MODULE), "O" }, \ | 25 | { (1UL << TAINT_OOT_MODULE), "O" }, \ |
| 26 | { (1UL << TAINT_FORCED_MODULE), "F" }, \ | 26 | { (1UL << TAINT_FORCED_MODULE), "F" }, \ |
| 27 | { (1UL << TAINT_CRAP), "C" }, \ | 27 | { (1UL << TAINT_CRAP), "C" }, \ |
| 28 | { (1UL << TAINT_UNSIGNED_MODULE), "X" }) | 28 | { (1UL << TAINT_UNSIGNED_MODULE), "E" }) |
| 29 | 29 | ||
| 30 | TRACE_EVENT(module_load, | 30 | TRACE_EVENT(module_load, |
| 31 | 31 | ||
| @@ -80,7 +80,7 @@ DECLARE_EVENT_CLASS(module_refcnt, | |||
| 80 | 80 | ||
| 81 | TP_fast_assign( | 81 | TP_fast_assign( |
| 82 | __entry->ip = ip; | 82 | __entry->ip = ip; |
| 83 | __entry->refcnt = __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs); | 83 | __entry->refcnt = __this_cpu_read(mod->refptr->incs) - __this_cpu_read(mod->refptr->decs); |
| 84 | __assign_str(name, mod->name); | 84 | __assign_str(name, mod->name); |
| 85 | ), | 85 | ), |
| 86 | 86 | ||