mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-05 09:14:03 +00:00
Code Issues Releases Activity

The SMP cleanup commit broke UP compiles. Make UP compiles work again.

Browse Source
This commit is contained in:
Matthew Dillon 2000-03-28 18:06:49 +00:00
parent 7791c9212c
commit db6a426158
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=58755
11 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/amd64/include/smp.h
View File

@ -183,6 +183,23 @@ extern int smp_started;
extern volatile int smp_idle_loops;
#endif /* !LOCORE */
#endif /* SMP || APIC_IO */
#else /* !SMP && !APIC_IO */
/*
* Create dummy MP lock empties
*/
static __inline void
get_mplock(void)
{
}
static __inline void
rel_mplock(void)
{
}
#endif
#endif /* _KERNEL */
#endif /* _MACHINE_SMP_H_ */

8
sys/i386/i386/mplock.s
View File

@ -65,6 +65,9 @@
.text
#ifdef SMP
/***********************************************************************
* void MPgetlock_edx(unsigned int *lock : %edx)
* ----------------------------------
@ -293,12 +296,16 @@ NON_GPROF_ENTRY(rel_mplock)
popl %ecx
ret
#endif
/***********************************************************************
*
*/
.data
.p2align 2 /* xx_lock aligned on int boundary */
#ifdef SMP
.globl _mp_lock
_mp_lock: .long 0
@ -322,3 +329,4 @@ _tryhits3:
msg:
.asciz "lock hits: 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x\n"
#endif /* GLPROFILE */
#endif /* SMP */

19
sys/i386/include/smp.h
View File

@ -183,6 +183,23 @@ extern int smp_started;
extern volatile int smp_idle_loops;
#endif /* !LOCORE */
#endif /* SMP || APIC_IO */
#else /* !SMP && !APIC_IO */
/*
* Create dummy MP lock empties
*/
static __inline void
get_mplock(void)
{
}
static __inline void
rel_mplock(void)
{
}
#endif
#endif /* _KERNEL */
#endif /* _MACHINE_SMP_H_ */

4
sys/kern/kern_clock.c
View File

@ -60,14 +60,12 @@
#include <machine/cpu.h>
#include <machine/limits.h>
#include <machine/smp.h>
#ifdef GPROF
#include <sys/gmon.h>
#endif
#if defined(SMP) && defined(BETTER_CLOCK)
#include <machine/smp.h>
#endif
static void initclocks __P((void *dummy));
SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)

3
sys/kern/kern_mib.c
View File

@ -46,10 +46,7 @@
#include <sys/sysctl.h>
#include <sys/proc.h>
#include <sys/jail.h>
#if defined(SMP)
#include <machine/smp.h>
#endif
SYSCTL_NODE(, 0, sysctl, CTLFLAG_RW, 0,
"Sysctl internal magic");

2
sys/kern/kern_shutdown.c
View File

@ -63,9 +63,7 @@
#include <machine/pcb.h>
#include <machine/clock.h>
#include <machine/md_var.h>
#ifdef SMP
#include <machine/smp.h> /* smp_active, cpuid */
#endif
#include <sys/signalvar.h>

2
sys/kern/kern_sig.c
View File

@ -66,9 +66,7 @@
#include <machine/ipl.h>
#include <machine/cpu.h>
#ifdef SMP
#include <machine/smp.h>
#endif
#define ONSIG 32 /* NSIG for osig* syscalls. XXX. */

2
sys/kern/kern_synch.c
View File

@ -58,9 +58,7 @@
#include <machine/cpu.h>
#include <machine/ipl.h>
#ifdef SMP
#include <machine/smp.h>
#endif
static void sched_setup __P((void *dummy));
SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL)

1
sys/sys/proc.h
View File

@ -372,6 +372,7 @@ extern u_long pgrphash;
#ifndef curproc
extern struct proc *curproc; /* Current running proc. */
extern u_int astpending; /* software interrupt pending */
extern int switchticks; /* `ticks' at last context switch. */
extern struct timeval switchtime; /* Uptime at last context switch */
#endif

2
sys/sys/signalvar.h
View File

@ -39,9 +39,7 @@
#include <sys/signal.h>
#include <sys/proc.h>
#ifdef SMP
#include <machine/smp.h>
#endif
/*
* Kernel signal definitions and data structures,

19
sys/sys/smp.h
View File

@ -183,6 +183,23 @@ extern int smp_started;
extern volatile int smp_idle_loops;
#endif /* !LOCORE */
#endif /* SMP || APIC_IO */
#else /* !SMP && !APIC_IO */
/*
* Create dummy MP lock empties
*/
static __inline void
get_mplock(void)
{
}
static __inline void
rel_mplock(void)
{
}
#endif
#endif /* _KERNEL */
#endif /* _MACHINE_SMP_H_ */