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

Commit 6bba07c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] memory hotplug: prevent memory zone interleave
  [S390] crash_dump: remove duplicate include
  [S390] KEYS: Enable the compat keyctl wrapper on s390x
parents d7e53922 892365ab

arch/s390/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -227,6 +227,9 @@ config COMPAT 
config SYSVIPC_COMPAT

config SYSVIPC_COMPAT

	def_bool y if COMPAT && SYSVIPC

	def_bool y if COMPAT && SYSVIPC





config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



config AUDIT_ARCH

config AUDIT_ARCH

	def_bool y

	def_bool y

arch/s390/kernel/crash_dump.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/gfp.h>

#include <linux/gfp.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/crash_dump.h>

#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/elf.h>

#include <linux/elf.h>

#include <asm/ipl.h>

#include <asm/ipl.h>

arch/s390/mm/init.c

+26 −4
Original line number Original line Diff line number Diff line
@@ -223,16 +223,38 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
#ifdef CONFIG_MEMORY_HOTPLUG

#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size)

int arch_add_memory(int nid, u64 start, u64 size)

{

{

	struct pglist_data *pgdat;

	unsigned long zone_start_pfn, zone_end_pfn, nr_pages;

	unsigned long start_pfn = PFN_DOWN(start);

	unsigned long size_pages = PFN_DOWN(size);

	struct zone *zone;

	struct zone *zone;

	int rc;

	int rc;





	pgdat = NODE_DATA(nid);

	zone = pgdat->node_zones + ZONE_MOVABLE;

	rc = vmem_add_mapping(start, size);

	rc = vmem_add_mapping(start, size);

	if (rc)

	if (rc)

		return rc;

		return rc;

	rc = __add_pages(nid, zone, PFN_DOWN(start), PFN_DOWN(size));

	for_each_zone(zone) {

		if (zone_idx(zone) != ZONE_MOVABLE) {

			/* Add range within existing zone limits */

			zone_start_pfn = zone->zone_start_pfn;

			zone_end_pfn = zone->zone_start_pfn +

				       zone->spanned_pages;

		} else {

			/* Add remaining range to ZONE_MOVABLE */

			zone_start_pfn = start_pfn;

			zone_end_pfn = start_pfn + size_pages;

		}

		if (start_pfn < zone_start_pfn || start_pfn >= zone_end_pfn)

			continue;

		nr_pages = (start_pfn + size_pages > zone_end_pfn) ?

			   zone_end_pfn - start_pfn : size_pages;

		rc = __add_pages(nid, zone, start_pfn, nr_pages);

		if (rc)

			break;

		start_pfn += nr_pages;

		size_pages -= nr_pages;

		if (!size_pages)

			break;

	}

	if (rc)

	if (rc)

		vmem_remove_mapping(start, size);

		vmem_remove_mapping(start, size);

	return rc;

	return rc;