PERFORCE change 30871 for review
John Baldwin
jhb at FreeBSD.org
Fri May 9 12:44:40 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30871
Change 30871 by jhb at jhb_laptop on 2003/05/09 12:44:30
IFC @30870.
Affected files ...
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/smpng/sys/amd64/include/npx.h#2 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#66 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#2 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.383 2003/05/01 01:05:22 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.384 2003/05/09 18:26:06 peter Exp $
machine amd64
cpu HAMMER
@@ -52,16 +52,16 @@
options KTRACE
# atkbdc0 controls both the keyboard and the PS/2 mouse
-#device atkbdc # AT keyboard controller
-#device atkbd # AT keyboard
-#device psm # PS/2 mouse
+device atkbdc # AT keyboard controller
+device atkbd # AT keyboard
+device psm # PS/2 mouse
-#device vga # VGA video card driver
+device vga # VGA video card driver
-#device splash # Splash screen and screen saver support
+device splash # Splash screen and screen saver support
# syscons is the default console driver, resembling an SCO console
-#device sc
+device sc
#device agp # support several AGP chipsets
==== //depot/projects/smpng/sys/amd64/include/npx.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/amd64/include/npx.h,v 1.27 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/npx.h,v 1.28 2003/05/09 18:28:05 peter Exp $
*/
/*
@@ -95,6 +95,8 @@
* intermediate values are stored in memory or in FPU registers.
*/
#define __INITIAL_NPXCW__ 0x127F
+#define __INITIAL_MXCSR__ 0x1F80
+#define __INITIAL_MXCSR_MASK__ 0xFFBF
#ifdef _KERNEL
int npxdna(void);
==== //depot/projects/smpng/sys/dev/syscons/syscons.c#29 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.401 2003/03/25 00:07:01 jake Exp $
+ * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.402 2003/05/09 18:24:40 peter Exp $
*/
#include "opt_syscons.h"
@@ -145,7 +145,7 @@
static int scparam(struct tty *tp, struct termios *t);
static void scstart(struct tty *tp);
static void scinit(int unit, int flags);
-#if __i386__ || __ia64__
+#if __i386__ || __ia64__ || __amd64__
static void scterm(int unit, int flags);
#endif
static void scshutdown(void *arg, int howto);
@@ -1361,7 +1361,7 @@
static void
sccnprobe(struct consdev *cp)
{
-#if __i386__ || __ia64__
+#if __i386__ || __ia64__ || __amd64__
int unit;
int flags;
@@ -1379,7 +1379,7 @@
/* initialize required fields */
cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL);
-#endif /* __i386__ || __ia64__ */
+#endif /* __i386__ || __ia64__ || __amd64__ */
#if __alpha__
/*
@@ -1394,7 +1394,7 @@
static void
sccninit(struct consdev *cp)
{
-#if __i386__ || __ia64__
+#if __i386__ || __ia64__ || __amd64__
int unit;
int flags;
@@ -1402,7 +1402,7 @@
scinit(unit, flags | SC_KERNEL_CONSOLE);
sc_console_unit = unit;
sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
-#endif /* __i386__ */
+#endif /* __i386__ || __ia64__ || __amd64__ */
#if __alpha__
/* SHOULDN'T REACH HERE */
@@ -1417,7 +1417,7 @@
if (sc_console_unit < 0)
return; /* shouldn't happen */
-#if __i386__ || __ia64__
+#if __i386__ || __ia64__ || __amd64__
#if 0 /* XXX */
sc_clear_screen(sc_console);
sccnupdate(sc_console);
@@ -1425,7 +1425,7 @@
scterm(sc_console_unit, SC_KERNEL_CONSOLE);
sc_console_unit = -1;
sc_console = NULL;
-#endif /* __i386__ */
+#endif /* __i386__ || __ia64__ || __amd64__ */
#if __alpha__
/* do nothing XXX */
@@ -2806,7 +2806,7 @@
sc->flags |= SC_INIT_DONE;
}
-#if __i386__ || __ia64__
+#if __i386__ || __ia64__ || __amd64__
static void
scterm(int unit, int flags)
{
@@ -2862,7 +2862,7 @@
sc->keyboard = -1;
sc->adapter = -1;
}
-#endif
+#endif /* __i386__ || __ia64__ || __amd64__ */
static void
scshutdown(void *arg, int howto)
==== //depot/projects/smpng/sys/kern/kern_sig.c#66 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_sig.c 8.7 (Berkeley) 4/18/94
- * $FreeBSD: src/sys/kern/kern_sig.c,v 1.236 2003/05/05 21:26:25 jhb Exp $
+ * $FreeBSD: src/sys/kern/kern_sig.c,v 1.237 2003/05/09 19:11:32 jhb Exp $
*/
#include "opt_compat.h"
@@ -1072,7 +1072,6 @@
kern_sigsuspend(struct thread *td, sigset_t mask)
{
struct proc *p = td->td_proc;
- register struct sigacts *ps;
/*
* When returning from sigsuspend, we want
@@ -1081,9 +1080,7 @@
* save it here and mark the sigacts structure
* to indicate this.
*/
- mtx_lock(&Giant);
PROC_LOCK(p);
- ps = p->p_sigacts;
td->td_oldsigmask = td->td_sigmask;
mtx_lock_spin(&sched_lock);
td->td_flags |= TDF_OLDMASK;
@@ -1091,10 +1088,9 @@
SIG_CANTMASK(mask);
td->td_sigmask = mask;
signotify(td);
- while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0)
+ while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0)
/* void */;
PROC_UNLOCK(p);
- mtx_unlock(&Giant);
/* always return EINTR rather than ERESTART... */
return (EINTR);
}
@@ -1116,11 +1112,8 @@
{
struct proc *p = td->td_proc;
sigset_t mask;
- register struct sigacts *ps;
- mtx_lock(&Giant);
PROC_LOCK(p);
- ps = p->p_sigacts;
td->td_oldsigmask = td->td_sigmask;
mtx_lock_spin(&sched_lock);
td->td_flags |= TDF_OLDMASK;
@@ -1129,10 +1122,9 @@
SIG_CANTMASK(mask);
SIGSETLO(td->td_sigmask, mask);
signotify(td);
- while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0)
+ while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0)
/* void */;
PROC_UNLOCK(p);
- mtx_unlock(&Giant);
/* always return EINTR rather than ERESTART... */
return (EINTR);
}
More information about the p4-projects
mailing list