diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 22:26:08 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 22:26:08 +0100 |
| commit | ac88ee3b6cbac80c32556a39fe16c4bbc55fcbc5 (patch) | |
| tree | 5053b061053b244e1ed3fd55bc0736c8dd1e6753 /fs/proc | |
| parent | Merge branch 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | genirq: Prevent proc race against freeing of irq descriptors (diff) | |
| download | linux-ac88ee3b6cbac80c32556a39fe16c4bbc55fcbc5.tar.xz linux-ac88ee3b6cbac80c32556a39fe16c4bbc55fcbc5.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq core fix from Thomas Gleixner:
"A single fix plugging a long standing race between proc/stat and
proc/interrupts access and freeing of interrupt descriptors"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Prevent proc race against freeing of irq descriptors
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/stat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index bf2d03f8fd3e..510413eb25b8 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -159,7 +159,7 @@ static int show_stat(struct seq_file *p, void *v) /* sum again ? it could be updated? */ for_each_irq_nr(j) - seq_put_decimal_ull(p, ' ', kstat_irqs(j)); + seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j)); seq_printf(p, "\nctxt %llu\n" |