diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-17 17:42:22 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-17 17:42:22 +0530 |
| commit | 8a848eb9e2cb9e8ac72484de6477c0a748d294b0 (patch) | |
| tree | 688519f5af4dd7c17877b9c344bb8f01d88f98ed /arch/x86/realmode/rm/trampoline_64.S | |
| parent | d09a3b11141326b583eaf31fd40e12ac3e8377e6 (diff) | |
| parent | 42375c1120d5c90d7469ba264fb124f728b1a4f7 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.112-hikey
Diffstat (limited to 'arch/x86/realmode/rm/trampoline_64.S')
| -rw-r--r-- | arch/x86/realmode/rm/trampoline_64.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S index dac7b20d2f9d..781cca63f795 100644 --- a/arch/x86/realmode/rm/trampoline_64.S +++ b/arch/x86/realmode/rm/trampoline_64.S @@ -30,6 +30,7 @@ #include <asm/msr.h> #include <asm/segment.h> #include <asm/processor-flags.h> +#include <asm/kaiser.h> #include "realmode.h" .text @@ -139,7 +140,7 @@ tr_gdt: tr_gdt_end: .bss - .balign PAGE_SIZE + .balign KAISER_KERNEL_PGD_ALIGNMENT GLOBAL(trampoline_pgd) .space PAGE_SIZE .balign 8 |