upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtrace: remove x86 non-EARLY_AP_STARTUP support

Browse source 
After 792655abd64c EARLY_AP_STARTUP is mandatory for x86.

Reviewed by:	markj
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D42139

(cherry picked from commit e49c7cd677df0b8691c828b55919ef37d8aad219)
This commit is contained in:
Ed Maste 2023-10-09 16:13:50 -04:00
parent c2009f3b5b
commit 5feb890554
2 changed files with 0 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sys/cddl/dev/dtrace/amd64/dtrace_subr.c
View file

@ -283,7 +283,6 @@ dtrace_gethrtime_init_cpu(void *arg)
hst_cpu_tsc = rdtsc();
}
#ifdef EARLY_AP_STARTUP
static void
dtrace_gethrtime_init(void *arg)
{
@ -291,16 +290,6 @@ dtrace_gethrtime_init(void *arg)
uint64_t tsc_f;
cpuset_t map;
int i;
#else
/*
* Get the frequency and scale factor as early as possible so that they can be
* used for boot-time tracing.
*/
static void
dtrace_gethrtime_init_early(void *arg)
{
uint64_t tsc_f;
#endif
/*
* Get TSC frequency known at this moment.
@ -329,18 +318,6 @@ dtrace_gethrtime_init_early(void *arg)
* (terahertz) values;
*/
nsec_scale = ((uint64_t)NANOSEC << SCALE_SHIFT) / tsc_f;
#ifndef EARLY_AP_STARTUP
}
SYSINIT(dtrace_gethrtime_init_early, SI_SUB_CPU, SI_ORDER_ANY,
dtrace_gethrtime_init_early, NULL);
static void
dtrace_gethrtime_init(void *arg)
{
struct pcpu *pc;
cpuset_t map;
int i;
#endif
if (vm_guest != VM_GUEST_NO)
return;
@ -364,13 +341,8 @@ dtrace_gethrtime_init(void *arg)
}
sched_unpin();
}
#ifdef EARLY_AP_STARTUP
SYSINIT(dtrace_gethrtime_init, SI_SUB_DTRACE, SI_ORDER_ANY,
dtrace_gethrtime_init, NULL);
#else
SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init,
NULL);
#endif
/*
* DTrace needs a high resolution time function which can

28
sys/cddl/dev/dtrace/i386/dtrace_subr.c
View file

@ -283,7 +283,6 @@ dtrace_gethrtime_init_cpu(void *arg)
hst_cpu_tsc = rdtsc();
}
#ifdef EARLY_AP_STARTUP
static void
dtrace_gethrtime_init(void *arg)
{
@ -291,16 +290,6 @@ dtrace_gethrtime_init(void *arg)
uint64_t tsc_f;
cpuset_t map;
int i;
#else
/*
* Get the frequency and scale factor as early as possible so that they can be
* used for boot-time tracing.
*/
static void
dtrace_gethrtime_init_early(void *arg)
{
uint64_t tsc_f;
#endif
/*
* Get TSC frequency known at this moment.
@ -329,18 +318,6 @@ dtrace_gethrtime_init_early(void *arg)
* (terahertz) values;
*/
nsec_scale = ((uint64_t)NANOSEC << SCALE_SHIFT) / tsc_f;
#ifndef EARLY_AP_STARTUP
}
SYSINIT(dtrace_gethrtime_init_early, SI_SUB_CPU, SI_ORDER_ANY,
dtrace_gethrtime_init_early, NULL);
static void
dtrace_gethrtime_init(void *arg)
{
cpuset_t map;
struct pcpu *pc;
int i;
#endif
if (vm_guest != VM_GUEST_NO)
return;
@ -364,13 +341,8 @@ dtrace_gethrtime_init(void *arg)
}
sched_unpin();
}
#ifdef EARLY_AP_STARTUP
SYSINIT(dtrace_gethrtime_init, SI_SUB_DTRACE, SI_ORDER_ANY,
dtrace_gethrtime_init, NULL);
#else
SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init,
NULL);
#endif
/*
* DTrace needs a high resolution time function which can