mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
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/
This commit is contained in:
commit
9ae21d1bb3
26 changed files with 50 additions and 98 deletions
|
|
@ -2354,10 +2354,8 @@ int make_pages_present(unsigned long addr, unsigned long end)
|
|||
if (!vma)
|
||||
return -1;
|
||||
write = (vma->vm_flags & VM_WRITE) != 0;
|
||||
if (addr >= end)
|
||||
BUG();
|
||||
if (end > vma->vm_end)
|
||||
BUG();
|
||||
BUG_ON(addr >= end);
|
||||
BUG_ON(end > vma->vm_end);
|
||||
len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE;
|
||||
ret = get_user_pages(current, current->mm, addr,
|
||||
len, write, 0, NULL, NULL);
|
||||
|
|
|
|||
|
|
@ -183,8 +183,8 @@ EXPORT_SYMBOL(mempool_resize);
|
|||
*/
|
||||
void mempool_destroy(mempool_t *pool)
|
||||
{
|
||||
if (pool->curr_nr != pool->min_nr)
|
||||
BUG(); /* There were outstanding elements */
|
||||
/* Check for outstanding elements */
|
||||
BUG_ON(pool->curr_nr != pool->min_nr);
|
||||
free_pool(pool);
|
||||
}
|
||||
EXPORT_SYMBOL(mempool_destroy);
|
||||
|
|
|
|||
Loading…
Reference in a new issue