diff options
| author | Damien Zammit <damien@zamaudio.com> | 2024-02-23 19:31:48 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2024-02-24 00:47:53 +1100 |
| commit | a108106f5a52003f5bd874fce017f7702c889cd2 (patch) | |
| tree | 9570070e40f7c81d17dbc14b6d179d597afd817a | |
| parent | be00985ada8ea0f7ed1dd0b2ed222b6f8c5ceefc (diff) | |
Revert "smp: Create AP processor set and put all APs inside it"fix-smp
This reverts commit aadb433981b086bfb4e082757fed1154582d5497.
| -rw-r--r-- | kern/machine.c | 13 | ||||
| -rw-r--r-- | kern/processor.c | 3 | ||||
| -rw-r--r-- | kern/processor.h | 3 |
3 files changed, 1 insertions, 18 deletions
diff --git a/kern/machine.c b/kern/machine.c index 1322b549..3cf8d57f 100644 --- a/kern/machine.c +++ b/kern/machine.c @@ -84,9 +84,6 @@ void cpu_up(int cpu) processor = cpu_to_processor(cpu); pset_lock(&default_pset); -#if MACH_HOST - pset_lock(slave_pset); -#endif s = splsched(); processor_lock(processor); #if NCPUS > 1 @@ -95,18 +92,10 @@ void cpu_up(int cpu) ms = &machine_slot[cpu]; ms->running = TRUE; machine_info.avail_cpus++; -#if MACH_HOST - if (cpu != 0) - pset_add_processor(slave_pset, processor); - else -#endif - pset_add_processor(&default_pset, processor); + pset_add_processor(&default_pset, processor); processor->state = PROCESSOR_RUNNING; processor_unlock(processor); splx(s); -#if MACH_HOST - pset_unlock(slave_pset); -#endif pset_unlock(&default_pset); } diff --git a/kern/processor.c b/kern/processor.c index 0e42fa37..391708cd 100644 --- a/kern/processor.c +++ b/kern/processor.c @@ -51,7 +51,6 @@ #if MACH_HOST #include <kern/slab.h> struct kmem_cache pset_cache; -struct processor_set *slave_pset; #endif /* MACH_HOST */ @@ -123,8 +122,6 @@ void pset_sys_init(void) ipc_processor_init(processor); } } - - processor_set_create(&realhost, &slave_pset, &slave_pset); } #endif /* MACH_HOST */ diff --git a/kern/processor.h b/kern/processor.h index c90d0529..0fe30d40 100644 --- a/kern/processor.h +++ b/kern/processor.h @@ -85,9 +85,6 @@ struct processor_set { long sched_load; /* load avg for scheduler */ }; extern struct processor_set default_pset; -#if MACH_HOST -extern struct processor_set *slave_pset; -#endif #ifdef MACH_LDEBUG #define pset_idle_lock() do { \ |