OSDN Git Service
(root)
/
android-x86
/
kernel.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/viro/vfs-2.6
[android-x86/kernel.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index
c1fc205
..
6c84e59
100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-58,7
+58,7
@@
/*
* Lock ordering:
*
- * ->i_mmap_lock (
vmtruncat
e)
+ * ->i_mmap_lock (
truncate_pagecach
e)
* ->private_lock (__free_pte->__set_page_dirty_buffers)
* ->swap_lock (exclusive_swap_page, others)
* ->mapping->tree_lock