git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[safe/jmp/linux-2.6]
/
include
/
linux
/
proportions.h
diff --git
a/include/linux/proportions.h
b/include/linux/proportions.h
index
5afc1b2
..
cf793bb
100644
(file)
--- a/
include/linux/proportions.h
+++ b/
include/linux/proportions.h
@@
-104,8
+104,8
@@
struct prop_local_single {
* snapshot of the last seen global state
* and a lock protecting this state
*/
- int shift;
unsigned long period;
+ int shift;
spinlock_t lock; /* protect the snapshot state */
};