diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-03-25 11:44:29 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-03-25 11:44:29 +0000 |
| commit | 24deabf1b29a72ec7cb8e4f5e8151d60f0066467 (patch) | |
| tree | 45c23e4b026158d9d17a63b7f5fa4ca35b943a3a /arch | |
| parent | 0c20856c260236b96f54c452d38dbe1348ed34d2 (diff) | |
| parent | 12eb3e833961bfe532b763a6e4e817ec87f48bc7 (diff) | |
| download | op-kernel-dev-24deabf1b29a72ec7cb8e4f5e8151d60f0066467.zip op-kernel-dev-24deabf1b29a72ec7cb8e4f5e8151d60f0066467.tar.gz | |
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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 2d760df..808398e 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -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") |
