Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24deabf1 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'aarch64/kvm-bounce-page' into aarch64/for-next/core 

linux-next testing found a bug with the PROVIDE keyword and older
versions of binutils, so Ard has fixed that here.
parents 0c20856c 12eb3e83

arch/arm/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -381,5 +381,5 @@ ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") 
 * and should not cross a page boundary.

 * The above comment applies as well.

 */

ASSERT((__hyp_idmap_text_start & ~PAGE_MASK) + __hyp_idmap_size <= PAGE_SIZE,

ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE,

	"HYP init code too big or misaligned")