aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/rd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
commitc00046c279a2521075250fad682ca0acc10d4fd7 (patch)
tree78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers/block/rd.c
parent9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff)
parent8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
Diffstat (limited to 'drivers/block/rd.c')
-rw-r--r--drivers/block/rd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 08176d23a46c..47f8ac6cce57 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -365,7 +365,7 @@ static int rd_open(struct inode *inode, struct file *filp)
365 /* 365 /*
366 * Deep badness. rd_blkdev_pagecache_IO() needs to allocate 366 * Deep badness. rd_blkdev_pagecache_IO() needs to allocate
367 * pagecache pages within a request_fn. We cannot recur back 367 * pagecache pages within a request_fn. We cannot recur back
368 * into the filesytem which is mounted atop the ramdisk, because 368 * into the filesystem which is mounted atop the ramdisk, because
369 * that would deadlock on fs locks. And we really don't want 369 * that would deadlock on fs locks. And we really don't want
370 * to reenter rd_blkdev_pagecache_IO when we're already within 370 * to reenter rd_blkdev_pagecache_IO when we're already within
371 * that function. 371 * that function.