Commit 14970f20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "20 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/misc/sgi-gru/grumain.c: remove bogus 0x prefix from printk
  cris/arch-v32: cryptocop: print a hex number after a 0x prefix
  ipack: print a hex number after a 0x prefix
  block: DAC960: print a hex number after a 0x prefix
  fs: exofs: print a hex number after a 0x prefix
  lib/genalloc.c: start search from start of chunk
  mm: memcontrol: do not recurse in direct reclaim
  CREDITS: update credit information for Martin Kepplinger
  proc: fix NULL dereference when reading /proc/<pid>/auxv
  mm: kmemleak: ensure that the task stack is not freed during scanning
  lib/stackdepot.c: bump stackdepot capacity from 16MB to 128MB
  latent_entropy: raise CONFIG_FRAME_WARN by default
  kconfig.h: remove config_enabled() macro
  ipc: account for kmem usage on mqueue and msg
  mm/slab: improve performance of gathering slabinfo stats
  mm: page_alloc: use KERN_CONT where appropriate
  mm/list_lru.c: avoid error-path NULL pointer deref
  h8300: fix syscall restarting
  kcov: properly check if we are in an interrupt
  mm/slab: fix kmemcg cache creation delayed issue
parents 67463e54 8e819101

CREDITS

+3 −2
Original line number Diff line number Diff line
@@ -1864,10 +1864,11 @@ S: The Netherlands 


N: Martin Kepplinger

E: martink@posteo.de

E: martin.kepplinger@theobroma-systems.com

E: martin.kepplinger@ginzinger.com

W: http://www.martinkepplinger.com

D: mma8452 accelerators iio driver

D: Kernel cleanups

D: pegasus_notetaker input driver

D: Kernel fixes and cleanups

S: Garnisonstraße 26

S: 4020 Linz

S: Austria

arch/cris/arch-v32/drivers/cryptocop.c

+1 −1
Original line number Diff line number Diff line
@@ -3149,7 +3149,7 @@ static void print_dma_descriptors(struct cryptocop_int_operation *iop) 
	printk("print_dma_descriptors start\n");



	printk("iop:\n");

	printk("\tsid: 0x%lld\n", iop->sid);

	printk("\tsid: 0x%llx\n", iop->sid);



	printk("\tcdesc_out: 0x%p\n", iop->cdesc_out);

	printk("\tcdesc_in: 0x%p\n", iop->cdesc_in);

arch/h8300/include/asm/thread_info.h

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct thread_info { 
	int		   cpu;			/* cpu we're on */

	int		   preempt_count;	/* 0 => preemptable, <0 => BUG */

	mm_segment_t		addr_limit;

	struct restart_block restart_block;

};



/*
@@ -44,9 +43,6 @@ struct thread_info { 
	.cpu =		0,			\

	.preempt_count = INIT_PREEMPT_COUNT,	\

	.addr_limit	= KERNEL_DS,		\

	.restart_block	= {			\

		.fn = do_no_restart_syscall,	\

	},					\

}



#define init_thread_info	(init_thread_union.thread_info)

arch/h8300/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ restore_sigcontext(struct sigcontext *usc, int *pd0) 
	unsigned int er0;



	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;

	current->restart_block.fn = do_no_restart_syscall;



	/* restore passed registers */

#define COPY(r)  do { err |= get_user(regs->r, &usc->sc_##r); } while (0)

arch/x86/mm/kaslr.c

+3 −3
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ void __init kernel_randomize_memory(void) 
	 * consistent with the vaddr_start/vaddr_end variables.

	 */

	BUILD_BUG_ON(vaddr_start >= vaddr_end);

	BUILD_BUG_ON(config_enabled(CONFIG_X86_ESPFIX64) &&

	BUILD_BUG_ON(IS_ENABLED(CONFIG_X86_ESPFIX64) &&

		     vaddr_end >= EFI_VA_START);

	BUILD_BUG_ON((config_enabled(CONFIG_X86_ESPFIX64) ||

		      config_enabled(CONFIG_EFI)) &&

	BUILD_BUG_ON((IS_ENABLED(CONFIG_X86_ESPFIX64) ||

		      IS_ENABLED(CONFIG_EFI)) &&

		     vaddr_end >= __START_KERNEL_map);

	BUILD_BUG_ON(vaddr_end > __START_KERNEL_map);

CRA Git | Maintained and supported by SUSTech CRA and CCSE