Commit 34c5c898 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "10 patches.

  Subsystems affected by this patch series: mm (pagealloc, gup, kasan,
  and userfaultfd), ipc, selftests, watchdog, bitmap, procfs, and lib"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  userfaultfd: hugetlbfs: fix new flag usage in error path
  lib: kunit: suppress a compilation warning of frame size
  proc: remove Alexey from MAINTAINERS
  linux/bits.h: fix compilation error with GENMASK
  watchdog: reliable handling of timestamps
  kasan: slab: always reset the tag in get_freepointer_safe()
  tools/testing/selftests/exec: fix link error
  ipc/mqueue, msg, sem: avoid relying on a stack reference past its expiry
  Revert "mm/gup: check page posion status for coredump."
  mm/shuffle: fix section mismatch warning
parents 4ff2473b e32905e5

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -14735,7 +14735,6 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/p54 
F:	drivers/net/wireless/intersil/prism54/









PROC FILESYSTEM









R:	Alexey Dobriyan <adobriyan@gmail.com>









L:	linux-kernel@vger.kernel.org









L:	linux-fsdevel@vger.kernel.org









S:	Maintained
































fs/hugetlbfs/inode.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -529,7 +529,7 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,







			 * the subpool and global reserve usage count can need









			 * to be adjusted.









			 */









			VM_BUG_ON(PagePrivate(page));









			VM_BUG_ON(HPageRestoreReserve(page));









			remove_huge_page(page);









			freed++;









			if (!truncate_op) {
































include/linux/bits.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -22,7 +22,7 @@







#include <linux/build_bug.h>









#define GENMASK_INPUT_CHECK(h, l) \









	(BUILD_BUG_ON_ZERO(__builtin_choose_expr( \









		__builtin_constant_p((l) > (h)), (l) > (h), 0)))









		__is_constexpr((l) > (h)), (l) > (h), 0)))









#else









/*









 * BUILD_BUG_ON_ZERO is not available in h files included from asm files,
































include/linux/const.h



+8
−0






























Original line number
Diff line number
Diff line







@@ -3,4 +3,12 @@

















#include <vdso/const.h>



















/*









 * This returns a constant expression while determining if an argument is









 * a constant expression, most importantly without evaluating the argument.









 * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>









 */









#define __is_constexpr(x) \









	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))



















#endif /* _LINUX_CONST_H */
























include/linux/minmax.h



+2
−8






























Original line number
Diff line number
Diff line







@@ -2,6 +2,8 @@







#ifndef _LINUX_MINMAX_H









#define _LINUX_MINMAX_H



















#include <linux/const.h>



















/*









 * min()/max()/clamp() macros must accomplish three things:









 *








@@ -17,14 +19,6 @@







#define __typecheck(x, y) \









	(!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))



















/*









 * This returns a constant expression while determining if an argument is









 * a constant expression, most importantly without evaluating the argument.









 * Glory to Martin Uecker <Martin.Uecker@med.uni-goettingen.de>









 */









#define __is_constexpr(x) \









	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))



















#define __no_side_effects(x, y) \









		(__is_constexpr(x) && __is_constexpr(y))