diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 23:29:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 23:29:58 +0200 |
| commit | 69ca06c9454169c4a9303e8834adae9080f94859 (patch) | |
| tree | d713fe8ac3ada06c0989706e237f6e6176396347 /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| parent | cfq-iosched: reset oom_cfqq in cfq_set_request() (diff) | |
| download | linux-69ca06c9454169c4a9303e8834adae9080f94859.tar.xz linux-69ca06c9454169c4a9303e8834adae9080f94859.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: reset oom_cfqq in cfq_set_request()
block: fix sg SG_DXFER_TO_FROM_DEV regression
block: call blk_scsi_ioctl_init()
Fix congestion_wait() sync/async vs read/write confusion
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lib/usercopy_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index 7c8ca91bb9ec..1f118d462acc 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c @@ -751,7 +751,7 @@ survive: if (retval == -ENOMEM && is_global_init(current)) { up_read(¤t->mm->mmap_sem); - congestion_wait(WRITE, HZ/50); + congestion_wait(BLK_RW_ASYNC, HZ/50); goto survive; } |