diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:58:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:58:04 -0400 |
commit | 57a8ec387e1441ea5e1232bc0749fb99a8cba7e7 (patch) | |
tree | b5fb03fc6bc5754de8b5b1f8b0e4f36d67c8315c /lib/test_overflow.c | |
parent | 0a8ad0ffa4d80a544f6cbff703bf6394339afcdf (diff) | |
parent | 43e11fa2d1d3b6e35629fa556eb7d571edba2010 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
"VM:
- z3fold fixes and enhancements by Henry Burns and Vitaly Wool
- more accurate reclaimed slab caches calculations by Yafang Shao
- fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by
Christoph Hellwig
- !CONFIG_MMU fixes by Christoph Hellwig
- new novmcoredd parameter to omit device dumps from vmcore, by
Kairui Song
- new test_meminit module for testing heap and pagealloc
initialization, by Alexander Potapenko
- ioremap improvements for huge mappings, by Anshuman Khandual
- generalize kprobe page fault handling, by Anshuman Khandual
- device-dax hotplug fixes and improvements, by Pavel Tatashin
- enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V
- add pte_devmap() support for arm64, by Robin Murphy
- unify locked_vm accounting with a helper, by Daniel Jordan
- several misc fixes
core/lib:
- new typeof_member() macro including some users, by Alexey Dobriyan
- make BIT() and GENMASK() available in asm, by Masahiro Yamada
- changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better
code generation, by Alexey Dobriyan
- rbtree code size optimizations, by Michel Lespinasse
- convert struct pid count to refcount_t, by Joel Fernandes
get_maintainer.pl:
- add --no-moderated switch to skip moderated ML's, by Joe Perches
misc:
- ptrace PTRACE_GET_SYSCALL_INFO interface
- coda updates
- gdb scripts, various"
[ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ]
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
fs/select.c: use struct_size() in kmalloc()
mm: add account_locked_vm utility function
arm64: mm: implement pte_devmap support
mm: introduce ARCH_HAS_PTE_DEVMAP
mm: clean up is_device_*_page() definitions
mm/mmap: move common defines to mman-common.h
mm: move MAP_SYNC to asm-generic/mman-common.h
device-dax: "Hotremove" persistent memory that is used like normal RAM
mm/hotplug: make remove_memory() interface usable
device-dax: fix memory and resource leak if hotplug fails
include/linux/lz4.h: fix spelling and copy-paste errors in documentation
ipc/mqueue.c: only perform resource calculation if user valid
include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
scripts/gdb: add helpers to find and list devices
scripts/gdb: add lx-genpd-summary command
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
kernel/pid.c: convert struct pid count to refcount_t
drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining()
select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR
...
Diffstat (limited to 'lib/test_overflow.c')
-rw-r--r-- | lib/test_overflow.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/test_overflow.c b/lib/test_overflow.c index fc680562d8b6..7a4b6f6c5473 100644 --- a/lib/test_overflow.c +++ b/lib/test_overflow.c | |||
@@ -486,16 +486,17 @@ static int __init test_overflow_shift(void) | |||
486 | * Deal with the various forms of allocator arguments. See comments above | 486 | * Deal with the various forms of allocator arguments. See comments above |
487 | * the DEFINE_TEST_ALLOC() instances for mapping of the "bits". | 487 | * the DEFINE_TEST_ALLOC() instances for mapping of the "bits". |
488 | */ | 488 | */ |
489 | #define alloc010(alloc, arg, sz) alloc(sz, GFP_KERNEL) | 489 | #define alloc_GFP (GFP_KERNEL | __GFP_NOWARN) |
490 | #define alloc011(alloc, arg, sz) alloc(sz, GFP_KERNEL, NUMA_NO_NODE) | 490 | #define alloc010(alloc, arg, sz) alloc(sz, alloc_GFP) |
491 | #define alloc011(alloc, arg, sz) alloc(sz, alloc_GFP, NUMA_NO_NODE) | ||
491 | #define alloc000(alloc, arg, sz) alloc(sz) | 492 | #define alloc000(alloc, arg, sz) alloc(sz) |
492 | #define alloc001(alloc, arg, sz) alloc(sz, NUMA_NO_NODE) | 493 | #define alloc001(alloc, arg, sz) alloc(sz, NUMA_NO_NODE) |
493 | #define alloc110(alloc, arg, sz) alloc(arg, sz, GFP_KERNEL) | 494 | #define alloc110(alloc, arg, sz) alloc(arg, sz, alloc_GFP) |
494 | #define free0(free, arg, ptr) free(ptr) | 495 | #define free0(free, arg, ptr) free(ptr) |
495 | #define free1(free, arg, ptr) free(arg, ptr) | 496 | #define free1(free, arg, ptr) free(arg, ptr) |
496 | 497 | ||
497 | /* Wrap around to 8K */ | 498 | /* Wrap around to 16K */ |
498 | #define TEST_SIZE (9 << PAGE_SHIFT) | 499 | #define TEST_SIZE (5 * 4096) |
499 | 500 | ||
500 | #define DEFINE_TEST_ALLOC(func, free_func, want_arg, want_gfp, want_node)\ | 501 | #define DEFINE_TEST_ALLOC(func, free_func, want_arg, want_gfp, want_node)\ |
501 | static int __init test_ ## func (void *arg) \ | 502 | static int __init test_ ## func (void *arg) \ |