diff options
| author | William Lee Irwin III <wli@holomorphy.com> | 2004-10-18 18:00:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 18:00:40 -0700 |
| commit | 9659cc899afad76f8d45e91e4ed244d65d95cf61 (patch) | |
| tree | 6031d97bd4f583afc8fa836ffbe3953ce619188d /mm | |
| parent | bc341c61fe34e873446bea41beff938f5bee44f2 (diff) | |
| download | history-9659cc899afad76f8d45e91e4ed244d65d95cf61.tar.gz | |
[PATCH] reduce number of parameters to __wait_on_bit() and __wait_on_bit_lock()
Some of the parameters to __wait_on_bit() and __wait_on_bit_lock() are
redundant, as the wait_bit_queue parameter holds the flags word and the bit
number. This patch updates __wait_on_bit() and __wait_on_bit_lock() to
fetch that information from the wait_bit_queue passed to them and so reduce
the number of parameters so that -mregparm may be more effective.
Incremental atop the complete out-of-lining of the contention cases and the
fastcall and wait_on_bit_lock()/test_and_set_bit() fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 14159485b57c68..382bd020a33fb8 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -381,8 +381,8 @@ void fastcall wait_on_page_bit(struct page *page, int bit_nr) DEFINE_WAIT_BIT(wait, &page->flags, bit_nr); if (test_bit(bit_nr, &page->flags)) - __wait_on_bit(page_waitqueue(page), &wait, wait.key.flags, - bit_nr, sync_page, TASK_UNINTERRUPTIBLE); + __wait_on_bit(page_waitqueue(page), &wait, sync_page, + TASK_UNINTERRUPTIBLE); } EXPORT_SYMBOL(wait_on_page_bit); @@ -440,8 +440,8 @@ void fastcall __lock_page(struct page *page) { DEFINE_WAIT_BIT(wait, &page->flags, PG_locked); - __wait_on_bit_lock(page_waitqueue(page), &wait, wait.key.flags, - PG_locked, sync_page, TASK_UNINTERRUPTIBLE); + __wait_on_bit_lock(page_waitqueue(page), &wait, sync_page, + TASK_UNINTERRUPTIBLE); } EXPORT_SYMBOL(__lock_page); |