Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
"Three patches"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
include/linux/mmdebug.h: should include linux/bug.h
mm/zswap: change incorrect strncmp use to strcmp
proc: fix -ESRCH error when writing to /proc/$pid/coredump_filter

+5 -3
+1
fs/proc/base.c
··· 2494 2494 mm = get_task_mm(task); 2495 2495 if (!mm) 2496 2496 goto out_no_mm; 2497 + ret = 0; 2497 2498 2498 2499 for (i = 0, mask = 1; i < MMF_DUMP_FILTER_BITS; i++, mask <<= 1) { 2499 2500 if (val & mask)
+1
include/linux/mmdebug.h
··· 1 1 #ifndef LINUX_MM_DEBUG_H 2 2 #define LINUX_MM_DEBUG_H 1 3 3 4 + #include <linux/bug.h> 4 5 #include <linux/stringify.h> 5 6 6 7 struct page;
+3 -3
mm/zswap.c
··· 541 541 return last; 542 542 } 543 543 544 + /* type and compressor must be null-terminated */ 544 545 static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor) 545 546 { 546 547 struct zswap_pool *pool; ··· 549 548 assert_spin_locked(&zswap_pools_lock); 550 549 551 550 list_for_each_entry_rcu(pool, &zswap_pools, list) { 552 - if (strncmp(pool->tfm_name, compressor, sizeof(pool->tfm_name))) 551 + if (strcmp(pool->tfm_name, compressor)) 553 552 continue; 554 - if (strncmp(zpool_get_type(pool->zpool), type, 555 - sizeof(zswap_zpool_type))) 553 + if (strcmp(zpool_get_type(pool->zpool), type)) 556 554 continue; 557 555 /* if we can't get it, it's about to be destroyed */ 558 556 if (!zswap_pool_get(pool))