]>
Commit | Line | Data |
---|---|---|
4dd5eeca JR |
1 | diff -urNp --exclude CVS --exclude BitKeeper x-ref/drivers/block/ll_rw_blk.c x/drivers/block/ll_rw_blk.c |
2 | --- x-ref/drivers/block/ll_rw_blk.c 2003-07-17 05:23:59.000000000 +0200 | |
3 | +++ x/drivers/block/ll_rw_blk.c 2003-07-17 05:29:00.000000000 +0200 | |
4 | @@ -1263,7 +1263,7 @@ void __submit_bh(int rw, struct buffer_h | |
5 | /* fix race condition with wait_on_buffer() */ | |
6 | smp_mb(); /* spin_unlock may have inclusive semantics */ | |
7 | if (waitqueue_active(&bh->b_wait)) | |
8 | - wake_up(&bh->b_wait); | |
9 | + run_task_queue(&tq_disk); | |
10 | ||
11 | put_bh(bh); | |
12 | switch (rw) { | |
13 | diff -urNp --exclude CVS --exclude BitKeeper x-ref/mm/filemap.c x/mm/filemap.c | |
14 | --- x-ref/mm/filemap.c 2003-07-17 05:23:58.000000000 +0200 | |
15 | +++ x/mm/filemap.c 2003-07-17 05:29:35.000000000 +0200 | |
16 | @@ -788,7 +788,7 @@ void wakeup_page_waiters(struct page * p | |
17 | ||
18 | head = page_waitqueue(page); | |
19 | if (waitqueue_active(head)) | |
20 | - wake_up(head); | |
21 | + sync_page(page); | |
22 | } | |
23 | ||
24 | /* | |
25 | diff -urNp --exclude CVS --exclude BitKeeper x-ref/mm/swapfile.c x/mm/swapfile.c | |
26 | --- x-ref/mm/swapfile.c 2003-07-17 05:23:58.000000000 +0200 | |
27 | +++ x/mm/swapfile.c 2003-07-17 05:24:00.000000000 +0200 | |
28 | @@ -997,8 +997,10 @@ asmlinkage long sys_swapon(const char * | |
29 | goto bad_swap; | |
30 | } | |
31 | ||
32 | + get_page(virt_to_page(swap_header)); | |
33 | lock_page(virt_to_page(swap_header)); | |
34 | rw_swap_page_nolock(READ, SWP_ENTRY(type,0), (char *) swap_header); | |
35 | + put_page(virt_to_page(swap_header)); | |
36 | ||
37 | if (!memcmp("SWAP-SPACE",swap_header->magic.magic,10)) | |
38 | swap_header_version = 1; |