Page MenuHomeFreeBSD
Files F149796772

D17013.id47688.diff
No OneTemporary
Actions

D17013.id47688.diff
View Options

Index: sys/amd64/amd64/mp_machdep.c
===================================================================
--- sys/amd64/amd64/mp_machdep.c
+++ sys/amd64/amd64/mp_machdep.c
@@ -371,6 +371,9 @@
amd64_conf_fast_syscall();
+ if (cpu_ops.cpu_init)
+ cpu_ops.cpu_init();
+
/* signal our startup to the BSP. */
mp_naps++;
Index: sys/i386/i386/mp_machdep.c
===================================================================
--- sys/i386/i386/mp_machdep.c
+++ sys/i386/i386/mp_machdep.c
@@ -277,7 +277,10 @@
cr0 &= ~(CR0_CD | CR0_NW | CR0_EM);
load_cr0(cr0);
CHECK_WRITE(0x38, 5);
-
+
+ if (cpu_ops.cpu_init)
+ cpu_ops.cpu_init();
+
/* signal our startup to the BSP. */
mp_naps++;
CHECK_WRITE(0x39, 6);
Index: sys/x86/acpica/madt.c
===================================================================
--- sys/x86/acpica/madt.c
+++ sys/x86/acpica/madt.c
@@ -759,4 +759,4 @@
la->la_acpi_id);
}
}
-SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_MIDDLE, madt_set_ids, NULL);
+SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_SECOND, madt_set_ids, NULL);
Index: sys/x86/x86/mp_x86.c
===================================================================
--- sys/x86/x86/mp_x86.c
+++ sys/x86/x86/mp_x86.c
@@ -994,9 +994,6 @@
npxinit(false);
#endif
- if (cpu_ops.cpu_init)
- cpu_ops.cpu_init();
-
/* A quick check from sanity claus */
cpuid = PCPU_GET(cpuid);
if (PCPU_GET(apic_id) != lapic_id()) {
Index: sys/x86/xen/pvcpu_enum.c
===================================================================
--- sys/x86/xen/pvcpu_enum.c
+++ sys/x86/xen/pvcpu_enum.c
@@ -249,19 +249,3 @@
}
}
SYSINIT(xenpv_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, xenpv_register, NULL);
-
-/*
- * Setup per-CPU vCPU IDs
- */
-static void
-xenpv_set_ids(void *dummy)
-{
- struct pcpu *pc;
- int i;
-
- CPU_FOREACH(i) {
- pc = pcpu_find(i);
- pc->pc_vcpu_id = i;
- }
-}
-SYSINIT(xenpv_set_ids, SI_SUB_CPU, SI_ORDER_MIDDLE, xenpv_set_ids, NULL);

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 28, 4:27 AM (12 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30457314
Default Alt Text
D17013.id47688.diff (1 KB)

Event Timeline