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.
This commit is contained in:
Will Deacon 2015-03-25 11:44:29 +00:00
commit 24deabf1b2

View File

@ -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")