[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-782b86641e5d471e9eb1cf0072c012d2f758e568@git.kernel.org>
Date: Sat, 30 Jan 2016 01:30:36 -0800
From: tip-bot for Toshi Kani <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: abanman@....com, mcgrof@...e.com, tglx@...utronix.de,
tangchen@...fujitsu.com, guz.fnst@...fujitsu.com,
toshi.kani@...com, akpm@...ux-foundation.org,
n-horiguchi@...jp.nec.com, boris.ostrovsky@...cle.com,
mingo@...nel.org, rientjes@...gle.com, peterz@...radead.org,
brgerst@...il.com, luto@...capital.net, bp@...en8.de,
dvlasenk@...hat.com, dan.j.williams@...el.com,
mgorman@...hsingularity.net, linux-kernel@...r.kernel.org,
konrad.wilk@...cle.com, linux-mm@...ck.org, toshi.kani@....com,
torvalds@...ux-foundation.org, hpa@...or.com, bp@...e.de
Subject: [tip:core/resources] xen, mm:
Set IORESOURCE_SYSTEM_RAM to System RAM
Commit-ID: 782b86641e5d471e9eb1cf0072c012d2f758e568
Gitweb: http://git.kernel.org/tip/782b86641e5d471e9eb1cf0072c012d2f758e568
Author: Toshi Kani <toshi.kani@....com>
AuthorDate: Tue, 26 Jan 2016 21:57:24 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Sat, 30 Jan 2016 09:49:58 +0100
xen, mm: Set IORESOURCE_SYSTEM_RAM to System RAM
Set IORESOURCE_SYSTEM_RAM in struct resource.flags of "System
RAM" entries.
Signed-off-by: Toshi Kani <toshi.kani@....com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Acked-by: David Vrabel <david.vrabel@...rix.com> # xen
Cc: Andrew Banman <abanman@....com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Boris Ostrovsky <boris.ostrovsky@...cle.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Dan Williams <dan.j.williams@...el.com>
Cc: David Rientjes <rientjes@...gle.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: Gu Zheng <guz.fnst@...fujitsu.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@...e.com>
Cc: Mel Gorman <mgorman@...hsingularity.net>
Cc: Naoya Horiguchi <n-horiguchi@...jp.nec.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Tang Chen <tangchen@...fujitsu.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Toshi Kani <toshi.kani@...com>
Cc: linux-arch@...r.kernel.org
Cc: linux-mm <linux-mm@...ck.org>
Cc: xen-devel@...ts.xenproject.org
Link: http://lkml.kernel.org/r/1453841853-11383-9-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
drivers/xen/balloon.c | 2 +-
mm/memory_hotplug.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 12eab50..dc4305b 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -257,7 +257,7 @@ static struct resource *additional_memory_resource(phys_addr_t size)
return NULL;
res->name = "System RAM";
- res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+ res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
ret = allocate_resource(&iomem_resource, res,
size, 0, -1,
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 4af58a3..979b18c 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -138,7 +138,7 @@ static struct resource *register_memory_resource(u64 start, u64 size)
res->name = "System RAM";
res->start = start;
res->end = start + size - 1;
- res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+ res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
if (request_resource(&iomem_resource, res) < 0) {
pr_debug("System RAM resource %pR cannot be added\n", res);
kfree(res);
Powered by blists - more mailing lists