diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-19 17:31:52 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-19 17:31:52 -0400 |
| commit | f70a290e8a889caa905ab7650c696f2bb299be1a (patch) | |
| tree | 56f0886d839499e9f522f189999024b3e86f9be2 /kernel/softirq.c | |
| parent | fcc9d2e5a6c89d22b8b773a64fb4ad21ac318446 (diff) | |
| parent | 7ef4a793a624c6e66c16ca1051847f75161f5bec (diff) | |
Merge branch 'wip-nested-locking' into tegra-nested-lockingwip-nested-locking
Conflicts:
Makefile
include/linux/fs.h
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index fca82c32042..2f2df08df39 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -211,6 +211,9 @@ asmlinkage void __do_softirq(void) | |||
| 211 | int max_restart = MAX_SOFTIRQ_RESTART; | 211 | int max_restart = MAX_SOFTIRQ_RESTART; |
| 212 | int cpu; | 212 | int cpu; |
| 213 | 213 | ||
| 214 | /* Mark Feather-Trace samples as "disturbed". */ | ||
| 215 | ft_irq_fired(); | ||
| 216 | |||
| 214 | pending = local_softirq_pending(); | 217 | pending = local_softirq_pending(); |
| 215 | account_system_vtime(current); | 218 | account_system_vtime(current); |
| 216 | 219 | ||