aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 12:41:18 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 12:41:18 -0500
commit9ae21d1bb376436285cd5346d3e4b3655d6dd1b9 (patch)
tree8f889770fae721da63bd378c1834a87e2eb1cfb5 /mm/memory.c
parentf9b4192923fa6e38331e88214b1fe5fc21583fcc (diff)
parente9415777b1cd0eaf4d1d3d61772f0e6d5c2551ad (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment Kconfig help: MTD_JEDECPROBE already supports Intel Remove ugly debugging stuff do_mounts.c: Minor ROOT_DEV comment cleanup BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c BUG_ON() Conversion in mm/mempool.c BUG_ON() Conversion in mm/memory.c BUG_ON() Conversion in kernel/fork.c BUG_ON() Conversion in ipc/sem.c BUG_ON() Conversion in fs/ext2/ BUG_ON() Conversion in fs/hfs/ BUG_ON() Conversion in fs/dcache.c BUG_ON() Conversion in fs/buffer.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c BUG_ON() Conversion in md/dm-table.c BUG_ON() Conversion in md/dm-path-selector.c BUG_ON() Conversion in drivers/isdn BUG_ON() Conversion in drivers/char BUG_ON() Conversion in drivers/mtd/
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 67686048f094..8d8f52569f32 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2354,10 +2354,8 @@ int make_pages_present(unsigned long addr, unsigned long end)
2354 if (!vma) 2354 if (!vma)
2355 return -1; 2355 return -1;
2356 write = (vma->vm_flags & VM_WRITE) != 0; 2356 write = (vma->vm_flags & VM_WRITE) != 0;
2357 if (addr >= end) 2357 BUG_ON(addr >= end);
2358 BUG(); 2358 BUG_ON(end > vma->vm_end);
2359 if (end > vma->vm_end)
2360 BUG();
2361 len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE; 2359 len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE;
2362 ret = get_user_pages(current, current->mm, addr, 2360 ret = get_user_pages(current, current->mm, addr,
2363 len, write, 0, NULL, NULL); 2361 len, write, 0, NULL, NULL);