diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /mm | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 7b84dc814347..13df01c50479 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -1893,6 +1893,7 @@ int should_remove_suid(struct dentry *dentry) | |||
| 1893 | 1893 | ||
| 1894 | return 0; | 1894 | return 0; |
| 1895 | } | 1895 | } |
| 1896 | EXPORT_SYMBOL(should_remove_suid); | ||
| 1896 | 1897 | ||
| 1897 | int __remove_suid(struct dentry *dentry, int kill) | 1898 | int __remove_suid(struct dentry *dentry, int kill) |
| 1898 | { | 1899 | { |