diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-23 09:36:46 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-23 09:36:46 +0300 |
| commit | fb86780bf7708cd6553f592a6318f10eda766127 (patch) | |
| tree | b59737c56a407c9f82166576209ef8e8cd09ecc6 /arch/x86/platform/intel-quark/imr.c | |
| parent | 8f8e2aec9944dd12671182a1a26b8e1a35872a1d (diff) | |
| parent | dd71a17b1193dd4a4c35ecd0ba227aac3d110836 (diff) | |
| download | linux-fb86780bf7708cd6553f592a6318f10eda766127.tar.xz | |
Merge branch 'x86/urgent' into x86/platform, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/intel-quark/imr.c')
| -rw-r--r-- | arch/x86/platform/intel-quark/imr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c index 0a3736f03edc..740445a53363 100644 --- a/arch/x86/platform/intel-quark/imr.c +++ b/arch/x86/platform/intel-quark/imr.c @@ -580,14 +580,14 @@ static void __init imr_fixup_memmap(struct imr_device *idev) end = (unsigned long)__end_rodata - 1; /* - * Setup a locked IMR around the physical extent of the kernel + * Setup an unlocked IMR around the physical extent of the kernel * from the beginning of the .text secton to the end of the * .rodata section as one physically contiguous block. * * We don't round up @size since it is already PAGE_SIZE aligned. * See vmlinux.lds.S for details. */ - ret = imr_add_range(base, size, IMR_CPU, IMR_CPU, true); + ret = imr_add_range(base, size, IMR_CPU, IMR_CPU, false); if (ret < 0) { pr_err("unable to setup IMR for kernel: %zu KiB (%lx - %lx)\n", size / 1024, start, end); |