diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-02 09:41:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-02 09:41:45 -0700 |
commit | 501dacbc2435c0198e0c8561f21bceeeeed87293 (patch) | |
tree | 95462b670005ecf40fde8aded07d68b11c86c099 /lib | |
parent | 360bd62dc4943a0754e6cb5637e01b5b43143cfc (diff) | |
parent | 113fc08357ad4e8b84caa75402430875d9ac4c1a (diff) | |
download | linux-501dacbc2435c0198e0c8561f21bceeeeed87293.tar.gz linux-501dacbc2435c0198e0c8561f21bceeeeed87293.tar.bz2 linux-501dacbc2435c0198e0c8561f21bceeeeed87293.zip |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
"A small set of updates for core code:
- Prevent tracing in functions which are called from trace patching
via stop_machine() to prevent executing half patched function trace
entries.
- Remove old GCC workarounds
- Remove pointless includes of notifier.h"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Remove workaround for unreachable warnings from old GCC
notifier: Remove notifier header file wherever not used
watchdog: Mark watchdog touch functions as notrace
Diffstat (limited to 'lib')
-rw-r--r-- | lib/percpu_counter.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index c72577e472f2..a66595ba5543 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c @@ -4,7 +4,6 @@ */ #include <linux/percpu_counter.h> -#include <linux/notifier.h> #include <linux/mutex.h> #include <linux/init.h> #include <linux/cpu.h> |