From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755706AbcA3Jbs (ORCPT ); Sat, 30 Jan 2016 04:31:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:37207 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753327AbcA3Jbo (ORCPT ); Sat, 30 Jan 2016 04:31:44 -0500 Date: Sat, 30 Jan 2016 01:30:14 -0800 From: tip-bot for Toshi Kani Message-ID: Cc: mnfhuang@gmail.com, bhe@redhat.com, akpm@linux-foundation.org, tglx@linutronix.de, toshi.kani@hp.com, luto@amacapital.net, dyoung@redhat.com, bp@alien8.de, d.hatayama@jp.fujitsu.com, dvlasenk@redhat.com, linux-mm@kvack.org, hpa@zytor.com, bp@suse.de, torvalds@linux-foundation.org, vgoyal@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, toshi.kani@hpe.com, mcgrof@suse.com, brgerst@gmail.com, peterz@infradead.org Reply-To: toshi.kani@hp.com, luto@amacapital.net, tglx@linutronix.de, bp@alien8.de, d.hatayama@jp.fujitsu.com, dyoung@redhat.com, akpm@linux-foundation.org, bhe@redhat.com, mnfhuang@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, vgoyal@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org, toshi.kani@hpe.com, mcgrof@suse.com, brgerst@gmail.com, linux-mm@kvack.org, hpa@zytor.com, dvlasenk@redhat.com, bp@suse.de In-Reply-To: <1453841853-11383-8-git-send-email-bp@alien8.de> References: <1453841853-11383-8-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/resources] kexec: Set IORESOURCE_SYSTEM_RAM for System RAM Git-Commit-ID: 1a085d0727afaedb9506f04798516298b1676e11 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1a085d0727afaedb9506f04798516298b1676e11 Gitweb: http://git.kernel.org/tip/1a085d0727afaedb9506f04798516298b1676e11 Author: Toshi Kani AuthorDate: Tue, 26 Jan 2016 21:57:23 +0100 Committer: Ingo Molnar CommitDate: Sat, 30 Jan 2016 09:49:57 +0100 kexec: Set IORESOURCE_SYSTEM_RAM for System RAM Set proper ioresource flags and types for crash kernel reservation areas. Signed-off-by: Toshi Kani Signed-off-by: Borislav Petkov Reviewed-by: Dave Young Cc: Andrew Morton Cc: Andy Lutomirski Cc: Baoquan He Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: HATAYAMA Daisuke Cc: Linus Torvalds Cc: Luis R. Rodriguez Cc: Minfei Huang Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Toshi Kani Cc: Vivek Goyal Cc: kexec@lists.infradead.org Cc: linux-arch@vger.kernel.org Cc: linux-mm Link: http://lkml.kernel.org/r/1453841853-11383-8-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- kernel/kexec_core.c | 8 +++++--- kernel/kexec_file.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 8dc6591..8d34308 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -66,13 +66,15 @@ struct resource crashk_res = { .name = "Crash kernel", .start = 0, .end = 0, - .flags = IORESOURCE_BUSY | IORESOURCE_MEM + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_CRASH_KERNEL }; struct resource crashk_low_res = { .name = "Crash kernel", .start = 0, .end = 0, - .flags = IORESOURCE_BUSY | IORESOURCE_MEM + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_CRASH_KERNEL }; int kexec_should_crash(struct task_struct *p) @@ -959,7 +961,7 @@ int crash_shrink_memory(unsigned long new_size) ram_res->start = end; ram_res->end = crashk_res.end; - ram_res->flags = IORESOURCE_BUSY | IORESOURCE_MEM; + ram_res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM; ram_res->name = "System RAM"; crashk_res.end = end - 1; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 007b791..2bfcdc0 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -525,7 +525,7 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, /* Walk the RAM ranges and allocate a suitable range for the buffer */ if (image->type == KEXEC_TYPE_CRASH) ret = walk_iomem_res("Crash kernel", - IORESOURCE_MEM | IORESOURCE_BUSY, + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, crashk_res.start, crashk_res.end, kbuf, locate_mem_hole_callback); else