diff options
author | Toshi Kani <toshi.kani@hpe.com> | 2016-01-26 15:57:22 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-01-30 03:49:57 -0500 |
commit | 35d98e93fe6a7ab612f6b389ce42c1dc135d6eef (patch) | |
tree | fe2d32527ed270c65c2137b3256818cdbc4b467b /arch/sh/kernel/setup.c | |
parent | 03cb525eb25018cf5f3da01d0f1391fc8b37805a (diff) |
arch: Set IORESOURCE_SYSTEM_RAM flag for System RAM
Set IORESOURCE_SYSTEM_RAM in flags of resource ranges with
"System RAM", "Kernel code", "Kernel data", and "Kernel bss".
Note that:
- IORESOURCE_SYSRAM (i.e. modifier bit) is set in flags when
IORESOURCE_MEM is already set. IORESOURCE_SYSTEM_RAM is defined
as (IORESOURCE_MEM|IORESOURCE_SYSRAM).
- Some archs do not set 'flags' for children nodes, such as
"Kernel code". This patch does not change 'flags' in this
case.
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Cc: linux-mm <linux-mm@kvack.org>
Cc: linux-parisc@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: sparclinux@vger.kernel.org
Link: http://lkml.kernel.org/r/1453841853-11383-7-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index de19cfa768f2..3f1c18b28e8a 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -78,17 +78,17 @@ static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, }; | |||
78 | 78 | ||
79 | static struct resource code_resource = { | 79 | static struct resource code_resource = { |
80 | .name = "Kernel code", | 80 | .name = "Kernel code", |
81 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM, | 81 | .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static struct resource data_resource = { | 84 | static struct resource data_resource = { |
85 | .name = "Kernel data", | 85 | .name = "Kernel data", |
86 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM, | 86 | .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, |
87 | }; | 87 | }; |
88 | 88 | ||
89 | static struct resource bss_resource = { | 89 | static struct resource bss_resource = { |
90 | .name = "Kernel bss", | 90 | .name = "Kernel bss", |
91 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM, | 91 | .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, |
92 | }; | 92 | }; |
93 | 93 | ||
94 | unsigned long memory_start; | 94 | unsigned long memory_start; |
@@ -202,7 +202,7 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, | |||
202 | res->name = "System RAM"; | 202 | res->name = "System RAM"; |
203 | res->start = start; | 203 | res->start = start; |
204 | res->end = end - 1; | 204 | res->end = end - 1; |
205 | res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; | 205 | res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; |
206 | 206 | ||
207 | if (request_resource(&iomem_resource, res)) { | 207 | if (request_resource(&iomem_resource, res)) { |
208 | pr_err("unable to request memory_resource 0x%lx 0x%lx\n", | 208 | pr_err("unable to request memory_resource 0x%lx 0x%lx\n", |