projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpica' into release
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
perf_event.h
diff --git
a/include/linux/perf_event.h
b/include/linux/perf_event.h
index 64a53f74c9a91d140331863bbc4a1e0423fbb7ee..da7bdc23f279eb4626b0c239386f1b0bce986f53 100644
(file)
--- a/
include/linux/perf_event.h
+++ b/
include/linux/perf_event.h
@@
-681,7
+681,7
@@
struct perf_event_context {
* Protect the states of the events in the list,
* nr_active, and the list:
*/
-
spinlock_t
lock;
+
raw_spinlock_t
lock;
/*
* Protect the list of events. Locking either mutex or lock
* is sufficient to ensure the list doesn't change; to change