diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /mm/filemap.c | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b7b1be6dbd83..5c74b68935ac 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -604,7 +604,7 @@ void __lock_page(struct page *page) | |||
| 604 | } | 604 | } |
| 605 | EXPORT_SYMBOL(__lock_page); | 605 | EXPORT_SYMBOL(__lock_page); |
| 606 | 606 | ||
| 607 | int fastcall __lock_page_killable(struct page *page) | 607 | int __lock_page_killable(struct page *page) |
| 608 | { | 608 | { |
| 609 | DEFINE_WAIT_BIT(wait, &page->flags, PG_locked); | 609 | DEFINE_WAIT_BIT(wait, &page->flags, PG_locked); |
| 610 | 610 | ||