diff options
| author | Linus Torvalds <[email protected]> | 2015-04-17 09:04:38 -0400 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-04-17 09:04:38 -0400 | 
| commit | 54e514b91b95d6441c12a7955addfb9f9d2afc65 (patch) | |
| tree | 8b73d901bd2a6ec5a31f34a8954e5ea92216dd6c /kernel/gcov/base.c | |
| parent | 4fc8adcfec3da639da76e8314c9ccefe5bf9a045 (diff) | |
| parent | 6c8c90319c0bb1c9e0b68e721359b89ae4f28465 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge third patchbomb from Andrew Morton:
 - various misc things
 - a couple of lib/ optimisations
 - provide DIV_ROUND_CLOSEST_ULL()
 - checkpatch updates
 - rtc tree
 - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs
 - ptrace fixes
 - fork() fixes
 - seccomp cleanups
 - more mmap_sem hold time reductions from Davidlohr
* emailed patches from Andrew Morton <[email protected]>: (138 commits)
  proc: show locks in /proc/pid/fdinfo/X
  docs: add missing and new /proc/PID/status file entries, fix typos
  drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
  Documentation/spi/spidev_test.c: fix warning
  drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
  .gitignore: ignore *.tar
  MAINTAINERS: add Mediatek SoC mailing list
  tomoyo: reduce mmap_sem hold for mm->exe_file
  powerpc/oprofile: reduce mmap_sem hold for exe_file
  oprofile: reduce mmap_sem hold for mm->exe_file
  mips: ip32: add platform data hooks to use DS1685 driver
  lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
  x86: switch to using asm-generic for seccomp.h
  sparc: switch to using asm-generic for seccomp.h
  powerpc: switch to using asm-generic for seccomp.h
  parisc: switch to using asm-generic for seccomp.h
  mips: switch to using asm-generic for seccomp.h
  microblaze: use asm-generic for seccomp.h
  arm: use asm-generic for seccomp.h
  seccomp: allow COMPAT sigreturn overrides
  ...
Diffstat (limited to 'kernel/gcov/base.c')
| -rw-r--r-- | kernel/gcov/base.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c index b358a802fd18..a744098e4eb7 100644 --- a/kernel/gcov/base.c +++ b/kernel/gcov/base.c @@ -18,6 +18,7 @@  #include <linux/init.h>  #include <linux/module.h>  #include <linux/mutex.h> +#include <linux/sched.h>  #include "gcov.h"  static int gcov_events_enabled; @@ -107,8 +108,10 @@ void gcov_enable_events(void)  	gcov_events_enabled = 1;  	/* Perform event callback for previously registered entries. */ -	while ((info = gcov_info_next(info))) +	while ((info = gcov_info_next(info))) {  		gcov_event(GCOV_ADD, info); +		cond_resched(); +	}  	mutex_unlock(&gcov_lock);  }  |