Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 238ca357 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "16 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: don't defer struct page initialization for Xen pv guests
  lib/Kconfig.debug: enable RUNTIME_TESTING_MENU
  vmalloc: fix __GFP_HIGHMEM usage for vmalloc_32 on 32b systems
  selftests/memfd: add run_fuse_test.sh to TEST_FILES
  bug.h: work around GCC PR82365 in BUG()
  mm/swap.c: make functions and their kernel-doc agree (again)
  mm/zpool.c: zpool_evictable: fix mismatch in parameter name and kernel-doc
  ida: do zeroing in ida_pre_get()
  mm, swap, frontswap: fix THP swap if frontswap enabled
  certs/blacklist_nohashes.c: fix const confusion in certs blacklist
  kernel/relay.c: limit kmalloc size to KMALLOC_MAX_SIZE
  mm, mlock, vmscan: no more skipping pagevecs
  mm: memcontrol: fix NR_WRITEBACK leak in memcg and system stats
  Kbuild: always define endianess in kconfig.h
  include/linux/sched/mm.h: re-inline mmdrop()
  tools: fix cross-compile var clobbering
parents bef3efbe 895f7b8e

arch/arc/include/asm/bug.h

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ void die(const char *str, struct pt_regs *regs, unsigned long address); 


#define BUG()	do {								\

	pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \

	dump_stack();								\

	barrier_before_unreachable();						\

	__builtin_trap();							\

} while (0)



#define HAVE_ARCH_BUG

arch/cris/include/arch-v10/arch/bug.h

+9 −2
Original line number Diff line number Diff line
@@ -44,18 +44,25 @@ struct bug_frame { 
 * not be used like this with newer versions of gcc.

 */

#define BUG()								\

do {									\

	__asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\

			      "movu.w " __stringify(__LINE__) ",$r0\n\t"\

			      "jump 0f\n\t"				\

			      ".section .rodata\n"			\

			      "0:\t.string \"" __FILE__ "\"\n\t"	\

			      ".previous")

			      ".previous");				\

	unreachable();							\

} while (0)

#endif



#else



/* This just causes an oops. */

#define BUG() (*(int *)0 = 0)

#define BUG()								\

do {									\

	barrier_before_unreachable();					\

	__builtin_trap();						\

} while (0)



#endif

arch/ia64/include/asm/bug.h

+5 −1
Original line number Diff line number Diff line
@@ -4,7 +4,11 @@ 


#ifdef CONFIG_BUG

#define ia64_abort()	__builtin_trap()

#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); ia64_abort(); } while (0)

#define BUG() do {						\

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__);	\

	barrier_before_unreachable();				\

	ia64_abort();						\

} while (0)



/* should this BUG be made generic? */

#define HAVE_ARCH_BUG

arch/m68k/include/asm/bug.h

+3 −0
Original line number Diff line number Diff line
@@ -8,16 +8,19 @@ 
#ifndef CONFIG_SUN3

#define BUG() do { \

	pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	barrier_before_unreachable(); \

	__builtin_trap(); \

} while (0)

#else

#define BUG() do { \

	pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	barrier_before_unreachable(); \

	panic("BUG!"); \

} while (0)

#endif

#else

#define BUG() do { \

	barrier_before_unreachable(); \

	__builtin_trap(); \

} while (0)

#endif

arch/sparc/include/asm/bug.h

+5 −1
Original line number Diff line number Diff line
@@ -9,10 +9,14 @@ 
void do_BUG(const char *file, int line);

#define BUG() do {					\

	do_BUG(__FILE__, __LINE__);			\

	barrier_before_unreachable();			\

	__builtin_trap();				\

} while (0)

#else

#define BUG()		__builtin_trap()

#define BUG() do {					\

	barrier_before_unreachable();			\

	__builtin_trap();				\

} while (0)

#endif



#define HAVE_ARCH_BUG