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

Commit ea5f39f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "7 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  proc: add Alexey to MAINTAINERS
  kasan: depend on CONFIG_SLUB_DEBUG
  include/linux/dax.h: dax_iomap_fault() returns vm_fault_t
  x86/e820: put !E820_TYPE_RAM regions into memblock.reserved
  slub: fix failure when we delete and create a slab cache
  Revert mm/vmstat.c: fix vmstat_update() preemption BUG
  lib/percpu_ida.c: don't do alloc from per-CPU list if there is none
parents a11e1d43 008e682b

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -11481,6 +11481,15 @@ W: http://wireless.kernel.org/en/users/Drivers/p54 
S:	Obsolete

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

F:	fs/proc/

F:	include/linux/proc_fs.h

F:	tools/testing/selftests/proc/



PROC SYSCTL

M:	"Luis R. Rodriguez" <mcgrof@kernel.org>

M:	Kees Cook <keescook@chromium.org>

arch/x86/kernel/e820.c

+12 −3
Original line number Diff line number Diff line
@@ -1248,6 +1248,7 @@ void __init e820__memblock_setup(void) 
{

	int i;

	u64 end;

	u64 addr = 0;



	/*

	 * The bootstrap memblock region count maximum is 128 entries
@@ -1264,12 +1265,20 @@ void __init e820__memblock_setup(void) 
		struct e820_entry *entry = &e820_table->entries[i];



		end = entry->addr + entry->size;

		if (addr < entry->addr)

			memblock_reserve(addr, entry->addr - addr);

		addr = end;

		if (end != (resource_size_t)end)

			continue;



		/*

		 * all !E820_TYPE_RAM ranges (including gap ranges) are put

		 * into memblock.reserved to make sure that struct pages in

		 * such regions are not left uninitialized after bootup.

		 */

		if (entry->type != E820_TYPE_RAM && entry->type != E820_TYPE_RESERVED_KERN)

			continue;



			memblock_reserve(entry->addr, entry->size);

		else

			memblock_add(entry->addr, entry->size);

	}

include/linux/dax.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void dax_flush(struct dax_device *dax_dev, void *addr, size_t size); 


ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,

		const struct iomap_ops *ops);

int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,

vm_fault_t dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,

		    pfn_t *pfnp, int *errp, const struct iomap_ops *ops);

vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf,

		enum page_entry_size pe_size, pfn_t pfn);

include/linux/slub_def.h

+4 −0
Original line number Diff line number Diff line
@@ -155,8 +155,12 @@ struct kmem_cache { 


#ifdef CONFIG_SYSFS

#define SLAB_SUPPORTS_SYSFS

void sysfs_slab_unlink(struct kmem_cache *);

void sysfs_slab_release(struct kmem_cache *);

#else

static inline void sysfs_slab_unlink(struct kmem_cache *s)

{

}

static inline void sysfs_slab_release(struct kmem_cache *s)

{

}

lib/Kconfig.kasan

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ if HAVE_ARCH_KASAN 
config KASAN

	bool "KASan: runtime memory debugger"

	depends on SLUB || (SLAB && !DEBUG_SLAB)

	select SLUB_DEBUG if SLUB

	select CONSTRUCTORS

	select STACKDEPOT

	help