88 lines
2.5 KiB
Diff
88 lines
2.5 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 74f3867461a0ec..3eda4d12d9244f 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 6
|
|
PATCHLEVEL = 6
|
|
-SUBLEVEL = 64
|
|
+SUBLEVEL = 65
|
|
EXTRAVERSION =
|
|
NAME = Pinguïn Aangedreven
|
|
|
|
diff --git a/arch/openrisc/include/asm/fixmap.h b/arch/openrisc/include/asm/fixmap.h
|
|
index aece6013fead1f..aaa6a26a3e9215 100644
|
|
--- a/arch/openrisc/include/asm/fixmap.h
|
|
+++ b/arch/openrisc/include/asm/fixmap.h
|
|
@@ -39,35 +39,6 @@ enum fixed_addresses {
|
|
extern void __set_fixmap(enum fixed_addresses idx,
|
|
phys_addr_t phys, pgprot_t flags);
|
|
|
|
-#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT))
|
|
-#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
|
|
-
|
|
-/*
|
|
- * 'index to address' translation. If anyone tries to use the idx
|
|
- * directly without tranlation, we catch the bug with a NULL-deference
|
|
- * kernel oops. Illegal ranges of incoming indices are caught too.
|
|
- */
|
|
-static __always_inline unsigned long fix_to_virt(const unsigned int idx)
|
|
-{
|
|
- /*
|
|
- * this branch gets completely eliminated after inlining,
|
|
- * except when someone tries to use fixaddr indices in an
|
|
- * illegal way. (such as mixing up address types or using
|
|
- * out-of-range indices).
|
|
- *
|
|
- * If it doesn't get removed, the linker will complain
|
|
- * loudly with a reasonably clear error message..
|
|
- */
|
|
- if (idx >= __end_of_fixed_addresses)
|
|
- BUG();
|
|
-
|
|
- return __fix_to_virt(idx);
|
|
-}
|
|
-
|
|
-static inline unsigned long virt_to_fix(const unsigned long vaddr)
|
|
-{
|
|
- BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
|
|
- return __virt_to_fix(vaddr);
|
|
-}
|
|
+#include <asm-generic/fixmap.h>
|
|
|
|
#endif
|
|
diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S
|
|
index 008a805522245f..c4365a05ab83b3 100644
|
|
--- a/arch/x86/platform/pvh/head.S
|
|
+++ b/arch/x86/platform/pvh/head.S
|
|
@@ -100,27 +100,7 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
|
|
xor %edx, %edx
|
|
wrmsr
|
|
|
|
- /*
|
|
- * Calculate load offset and store in phys_base. __pa() needs
|
|
- * phys_base set to calculate the hypercall page in xen_pvh_init().
|
|
- */
|
|
- movq %rbp, %rbx
|
|
- subq $_pa(pvh_start_xen), %rbx
|
|
- movq %rbx, phys_base(%rip)
|
|
-
|
|
- /* Call xen_prepare_pvh() via the kernel virtual mapping */
|
|
- leaq xen_prepare_pvh(%rip), %rax
|
|
- subq phys_base(%rip), %rax
|
|
- addq $__START_KERNEL_map, %rax
|
|
- ANNOTATE_RETPOLINE_SAFE
|
|
- call *%rax
|
|
-
|
|
- /*
|
|
- * Clear phys_base. __startup_64 will *add* to its value,
|
|
- * so reset to 0.
|
|
- */
|
|
- xor %rbx, %rbx
|
|
- movq %rbx, phys_base(%rip)
|
|
+ call xen_prepare_pvh
|
|
|
|
/* startup_64 expects boot_params in %rsi. */
|
|
mov $_pa(pvh_bootparams), %rsi
|