Page MenuHomeFreeBSD
Files F174422447

D59437.id187110.diff
No OneTemporary
Actions

D59437.id187110.diff
View Options

diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -161,7 +161,7 @@
};
static void
-sched_4bsd_schedcpu(void)
+sched_4bsd_sysinit(void)
{
kproc_start(&sched_kp);
}
@@ -1889,7 +1889,7 @@
SLOT(init_ap),
SLOT(setup),
SLOT(initticks),
- SLOT(schedcpu),
+ SLOT(sysinit),
#undef SLOT
};
DECLARE_SCHEDULER(fourbsd_sched_selector, "4BSD", &sched_4bsd_instance);
diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c
--- a/sys/kern/sched_shim.c
+++ b/sys/kern/sched_shim.c
@@ -181,11 +181,11 @@
NULL);
static void
-sched_schedcpu(void)
+sched_sysinit(void)
{
- active_sched->schedcpu();
+ active_sched->sysinit();
}
-SYSINIT(schedcpu, SI_SUB_LAST, SI_ORDER_FIRST, sched_schedcpu, NULL);
+SYSINIT(sched_sysinit, SI_SUB_LAST, SI_ORDER_FIRST, sched_sysinit, NULL);
SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
"Scheduler");
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -3347,7 +3347,7 @@
}
static void
-sched_ule_schedcpu(void)
+sched_ule_sysinit(void)
{
}
@@ -3465,7 +3465,7 @@
SLOT(init_ap),
SLOT(setup),
SLOT(initticks),
- SLOT(schedcpu),
+ SLOT(sysinit),
#undef SLOT
};
DECLARE_SCHEDULER(ule_sched_selector, "ULE", &sched_ule_instance);
diff --git a/sys/sys/sched.h b/sys/sys/sched.h
--- a/sys/sys/sched.h
+++ b/sys/sys/sched.h
@@ -323,7 +323,8 @@
void (*init_ap)(void);
void (*setup)(void);
void (*initticks)(void);
- void (*schedcpu)(void);
+ /* Scheduler init, to be called only from 'sched_shim.c'. */
+ void (*sysinit)(void);
};
extern const struct sched_instance *active_sched;

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 4, 2:15 AM (3 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40089920
Default Alt Text
D59437.id187110.diff (1 KB)

Event Timeline