AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-02 06:26:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Just as we thought we'd fixed this, another old linker reared its ugly
head trying to build linux-next. Unfortunately, it's the linker binary
provided on kernel.org, so give up trying to be clever and align the
hyp page to 4k.
This commit is contained in:
Will Deacon 2015-03-27 12:22:50 +00:00
commit 849176c96d
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/kernel/vmlinux.lds.S
View File

@ -12,26 +12,6 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#endif #endif
/*
* Poor man's version of LOG2CEIL(), which is
* not available in binutils before v2.24.
*/
#define LOG2_ROUNDUP(size) ( \
__LOG2_ROUNDUP(size, 2) \
__LOG2_ROUNDUP(size, 3) \
__LOG2_ROUNDUP(size, 4) \
__LOG2_ROUNDUP(size, 5) \
__LOG2_ROUNDUP(size, 6) \
__LOG2_ROUNDUP(size, 7) \
__LOG2_ROUNDUP(size, 8) \
__LOG2_ROUNDUP(size, 9) \
__LOG2_ROUNDUP(size, 10) \
__LOG2_ROUNDUP(size, 11) \
12)
#define __LOG2_ROUNDUP(size, order) \
(size) <= (1 << order) ? order :
#define PROC_INFO \ #define PROC_INFO \
. = ALIGN(4); \ . = ALIGN(4); \
VMLINUX_SYMBOL(__proc_info_begin) = .; \ VMLINUX_SYMBOL(__proc_info_begin) = .; \
@ -43,20 +23,11 @@
VMLINUX_SYMBOL(__idmap_text_start) = .; \ VMLINUX_SYMBOL(__idmap_text_start) = .; \
*(.idmap.text) \ *(.idmap.text) \
VMLINUX_SYMBOL(__idmap_text_end) = .; \ VMLINUX_SYMBOL(__idmap_text_end) = .; \
. = ALIGN(1 << LOG2_ROUNDUP(__hyp_idmap_size)); \ . = ALIGN(PAGE_SIZE); \
VMLINUX_SYMBOL(__hyp_idmap_text_start) = .; \ VMLINUX_SYMBOL(__hyp_idmap_text_start) = .; \
*(.hyp.idmap.text) \ *(.hyp.idmap.text) \
VMLINUX_SYMBOL(__hyp_idmap_text_end) = .; VMLINUX_SYMBOL(__hyp_idmap_text_end) = .;
/*
* If the HYP idmap .text section is populated, it needs to be positioned
* such that it will not cross a page boundary in the final output image.
* So align it to the section size rounded up to the next power of 2.
* If __hyp_idmap_size is undefined, the section will be empty so define
* it as 0 in that case.
*/
PROVIDE(__hyp_idmap_size = 0);
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
#define ARM_CPU_DISCARD(x) #define ARM_CPU_DISCARD(x)
#define ARM_CPU_KEEP(x) x #define ARM_CPU_KEEP(x) x

3
arch/arm/kvm/init.S
View File

@ -157,6 +157,3 @@ target: @ We're now in the trampoline code, switch page tables
__kvm_hyp_init_end: __kvm_hyp_init_end:
.popsection .popsection
.global __hyp_idmap_size
.set __hyp_idmap_size, __kvm_hyp_init_end - __kvm_hyp_init