Commit-ID: 782b86641e5d471e9eb1cf0072c012d2f758e568 Gitweb: http://git.kernel.org/tip/782b86641e5d471e9eb1cf0072c012d2f758e568 Author: Toshi Kani <toshi.k...@hpe.com> AuthorDate: Tue, 26 Jan 2016 21:57:24 +0100 Committer: Ingo Molnar <mi...@kernel.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.k...@hpe.com> Signed-off-by: Borislav Petkov <b...@suse.de> Acked-by: David Vrabel <david.vra...@citrix.com> # xen Cc: Andrew Banman <aban...@sgi.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Boris Ostrovsky <boris.ostrov...@oracle.com> Cc: Borislav Petkov <b...@alien8.de> Cc: Brian Gerst <brge...@gmail.com> Cc: Dan Williams <dan.j.willi...@intel.com> Cc: David Rientjes <rient...@google.com> Cc: Denys Vlasenko <dvlas...@redhat.com> Cc: Gu Zheng <guz.f...@cn.fujitsu.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Luis R. Rodriguez <mcg...@suse.com> Cc: Mel Gorman <mgor...@techsingularity.net> Cc: Naoya Horiguchi <n-horigu...@ah.jp.nec.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Tang Chen <tangc...@cn.fujitsu.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Toshi Kani <toshi.k...@hp.com> Cc: linux-a...@vger.kernel.org Cc: linux-mm <linux...@kvack.org> Cc: xen-de...@lists.xenproject.org Link: http://lkml.kernel.org/r/1453841853-11383-9-git-send-email...@alien8.de Signed-off-by: Ingo Molnar <mi...@kernel.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);
