projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
include
/
linux
/
buffer_head.h
diff --git
a/include/linux/buffer_head.h
b/include/linux/buffer_head.h
index
eadaab4
..
3ce64b9
100644
(file)
--- a/
include/linux/buffer_head.h
+++ b/
include/linux/buffer_head.h
@@
-322,7
+322,7
@@
static inline void wait_on_buffer(struct buffer_head *bh)
static inline int trylock_buffer(struct buffer_head *bh)
{
- return likely(!test_and_set_bit(BH_Lock, &bh->b_state));
+ return likely(!test_and_set_bit
_lock
(BH_Lock, &bh->b_state));
}
static inline void lock_buffer(struct buffer_head *bh)