shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 12:00:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "arm64/arm: xen: enlighten: Fix KPTI checks"

Browse Source 
This reverts commit a00a293d57 which is
commit 20f3b8eafe0ba5d3c69d5011a9b07739e9645132 upstream.

It breaks the Android ABI and we do not care about Xen on Android, so it
is safe to revert.

Bug: 161946584
Change-Id: I4bf8a87650256a5f4b2faee626557604631ee286
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-11-29 14:26:31 +00:00
parent cfaf15fcaf
commit 99e8e6c9c4
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/xen/enlighten.c
View File

@@ -159,6 +159,9 @@ static int xen_starting_cpu(unsigned int cpu)
BUG_ON(err);
per_cpu(xen_vcpu, cpu) = vcpup;
if (!xen_kernel_unmapped_at_usr())
xen_setup_runstate_info(cpu);
after_register_vcpu_info:
enable_percpu_irq(xen_events_irq, 0);
return 0;
@@ -391,6 +394,9 @@ static int __init xen_guest_init(void)
return -EINVAL;
}
if (!xen_kernel_unmapped_at_usr())
xen_time_setup_guest();
if (xen_initial_domain())
pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier);
@@ -400,13 +406,7 @@ static int __init xen_guest_init(void)
}
early_initcall(xen_guest_init);
static int xen_starting_runstate_cpu(unsigned int cpu)
{
xen_setup_runstate_info(cpu);
return 0;
}
static int __init xen_late_init(void)
static int __init xen_pm_init(void)
{
if (!xen_domain())
return -ENODEV;
@@ -419,16 +419,9 @@ static int __init xen_late_init(void)
do_settimeofday64(&ts);
}
if (xen_kernel_unmapped_at_usr())
return 0;
xen_time_setup_guest();
return cpuhp_setup_state(CPUHP_AP_ARM_XEN_RUNSTATE_STARTING,
"arm/xen_runstate:starting",
xen_starting_runstate_cpu, NULL);
return 0;
}
late_initcall(xen_late_init);
late_initcall(xen_pm_init);
/* empty stubs */

1
include/linux/cpuhotplug.h
View File

@@ -188,7 +188,6 @@ enum cpuhp_state {
/* Must be the last timer callback */
CPUHP_AP_DUMMY_TIMER_STARTING,
CPUHP_AP_ARM_XEN_STARTING,
CPUHP_AP_ARM_XEN_RUNSTATE_STARTING,
CPUHP_AP_ARM_CORESIGHT_STARTING,
CPUHP_AP_ARM_CORESIGHT_CTI_STARTING,
CPUHP_AP_ARM64_ISNDEP_STARTING,