diff options
author | jb <jb@FreeBSD.org> | 2006-10-26 21:42:22 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 2006-10-26 21:42:22 +0000 |
commit | f82c7997354f95e680341bb8e10136ded5fd15eb (patch) | |
tree | 2136d90e7e60f4ef25fe147499787d0e6a155b82 /sys/powerpc | |
parent | b3e38fbc69f126c6cc49a0a6e45096d6c01b7c43 (diff) | |
download | FreeBSD-src-f82c7997354f95e680341bb8e10136ded5fd15eb.zip FreeBSD-src-f82c7997354f95e680341bb8e10136ded5fd15eb.tar.gz |
Make KSE a kernel option, turned on by default in all GENERIC
kernel configs except sun4v (which doesn't process signals properly
with KSE).
Reviewed by: davidxu@
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/aim/machdep.c | 4 | ||||
-rw-r--r-- | sys/powerpc/aim/trap.c | 2 | ||||
-rw-r--r-- | sys/powerpc/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/powerpc/powerpc/machdep.c | 4 | ||||
-rw-r--r-- | sys/powerpc/powerpc/trap.c | 2 |
5 files changed, 13 insertions, 0 deletions
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 5b7c0df..48d5b1b 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -295,7 +295,11 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) /* * Start initializing proc0 and thread0. */ +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_frame = &frame0; /* diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c index 08bd248..958f799 100644 --- a/sys/powerpc/aim/trap.c +++ b/sys/powerpc/aim/trap.c @@ -351,8 +351,10 @@ syscall(struct trapframe *frame) PCPU_LAZY_INC(cnt.v_syscall); +#ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); +#endif code = frame->fixreg[0]; params = (caddr_t)(frame->fixreg + FIRSTARG); diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 716e173..c56f06e 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -56,6 +56,7 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options KSE # KSE support # Debugging for use in -current options KDB #Enable the kernel debugger diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 5b7c0df..48d5b1b 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -295,7 +295,11 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) /* * Start initializing proc0 and thread0. */ +#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); +#else + proc_linkup(&proc0, &thread0); +#endif thread0.td_frame = &frame0; /* diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index 08bd248..958f799 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -351,8 +351,10 @@ syscall(struct trapframe *frame) PCPU_LAZY_INC(cnt.v_syscall); +#ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); +#endif code = frame->fixreg[0]; params = (caddr_t)(frame->fixreg + FIRSTARG); |