diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:20:03 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:20:03 +0200 |
| commit | 4bb86062b45ca43f536131c4f3d02ecd9ad66eca (patch) | |
| tree | 40ad320a8e600e1ee74ee3723ea2c6b0890ad5a2 /arch/arm/kernel | |
| parent | c1d2a6fa7e3635a0ac4e2a7cbe7ccbc2059b6968 (diff) | |
| parent | e6de9a8b5b30ebbc4d96df447ddee3202f1b4daf (diff) | |
Merge tag 'v5.4.157' into HEAD
This is the 5.4.157 stable release
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/vmlinux-xip.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S index 8c74037ade22..b1f366df620b 100644 --- a/arch/arm/kernel/vmlinux-xip.lds.S +++ b/arch/arm/kernel/vmlinux-xip.lds.S @@ -180,7 +180,7 @@ ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE, ASSERT((_end - __bss_start) >= 12288, ".bss too small for CONFIG_XIP_DEFLATED_DATA") #endif -#ifdef CONFIG_ARM_MPU +#if defined(CONFIG_ARM_MPU) && !defined(CONFIG_COMPILE_TEST) /* * Due to PMSAv7 restriction on base address and size we have to * enforce minimal alignment restrictions. It was seen that weaker |