svn commit: r212561 - in user/imp/tbemd: contrib/top sys/mips/conf sys/powerpc/powerpc

[Warner Losh]

Author: imp
Date: Mon Sep 13 16:43:41 2010
New Revision: 212561
URL: http://svn.freebsd.org/changeset/base/212561

Log:
  Merge from head @r212560

Modified:
  user/imp/tbemd/sys/mips/conf/MALTA64
  user/imp/tbemd/sys/mips/conf/OCTEON1
  user/imp/tbemd/sys/powerpc/powerpc/mp_machdep.c
Directory Properties:
  user/imp/tbemd/   (props changed)
  user/imp/tbemd/cddl/contrib/opensolaris/   (props changed)
  user/imp/tbemd/contrib/bind9/   (props changed)
  user/imp/tbemd/contrib/ee/   (props changed)
  user/imp/tbemd/contrib/expat/   (props changed)
  user/imp/tbemd/contrib/file/   (props changed)
  user/imp/tbemd/contrib/gdb/   (props changed)
  user/imp/tbemd/contrib/gdtoa/   (props changed)
  user/imp/tbemd/contrib/gnu-sort/   (props changed)
  user/imp/tbemd/contrib/groff/   (props changed)
  user/imp/tbemd/contrib/less/   (props changed)
  user/imp/tbemd/contrib/libpcap/   (props changed)
  user/imp/tbemd/contrib/llvm/   (props changed)
  user/imp/tbemd/contrib/llvm/tools/clang/   (props changed)
  user/imp/tbemd/contrib/ncurses/   (props changed)
  user/imp/tbemd/contrib/netcat/   (props changed)
  user/imp/tbemd/contrib/ntp/   (props changed)
  user/imp/tbemd/contrib/one-true-awk/   (props changed)
  user/imp/tbemd/contrib/openbsm/   (props changed)
  user/imp/tbemd/contrib/openpam/   (props changed)
  user/imp/tbemd/contrib/pf/   (props changed)
  user/imp/tbemd/contrib/sendmail/   (props changed)
  user/imp/tbemd/contrib/tcpdump/   (props changed)
  user/imp/tbemd/contrib/tcsh/   (props changed)
  user/imp/tbemd/contrib/top/   (props changed)
  user/imp/tbemd/contrib/top/install-sh   (props changed)
  user/imp/tbemd/contrib/tzcode/stdtime/   (props changed)
  user/imp/tbemd/contrib/tzcode/zic/   (props changed)
  user/imp/tbemd/contrib/tzdata/   (props changed)
  user/imp/tbemd/contrib/wpa/   (props changed)
  user/imp/tbemd/crypto/openssh/   (props changed)
  user/imp/tbemd/crypto/openssl/   (props changed)
  user/imp/tbemd/lib/libc/   (props changed)
  user/imp/tbemd/lib/libc/stdtime/   (props changed)
  user/imp/tbemd/lib/libutil/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)
  user/imp/tbemd/sbin/   (props changed)
  user/imp/tbemd/sbin/ipfw/   (props changed)
  user/imp/tbemd/share/zoneinfo/   (props changed)
  user/imp/tbemd/sys/   (props changed)
  user/imp/tbemd/sys/amd64/include/xen/   (props changed)
  user/imp/tbemd/sys/cddl/contrib/opensolaris/   (props changed)
  user/imp/tbemd/sys/contrib/dev/acpica/   (props changed)
  user/imp/tbemd/sys/contrib/pf/   (props changed)
  user/imp/tbemd/sys/contrib/x86emu/   (props changed)
  user/imp/tbemd/sys/dev/xen/xenpci/   (props changed)
  user/imp/tbemd/usr.bin/calendar/   (props changed)
  user/imp/tbemd/usr.bin/csup/   (props changed)
  user/imp/tbemd/usr.bin/procstat/   (props changed)
  user/imp/tbemd/usr.sbin/zic/   (props changed)

Modified: user/imp/tbemd/sys/mips/conf/MALTA64
==============================================================================
--- user/imp/tbemd/sys/mips/conf/MALTA64	Mon Sep 13 16:39:33 2010	(r212560)
+++ user/imp/tbemd/sys/mips/conf/MALTA64	Mon Sep 13 16:43:41 2010	(r212561)
@@ -21,7 +21,6 @@ ident		MALTA
 
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
 makeoptions	MIPS_LITTLE_ENDIAN=defined
-makeoptions	TARGET_64BIT=t
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.mips64
 
 options 	YAMON

Modified: user/imp/tbemd/sys/mips/conf/OCTEON1
==============================================================================
--- user/imp/tbemd/sys/mips/conf/OCTEON1	Mon Sep 13 16:39:33 2010	(r212560)
+++ user/imp/tbemd/sys/mips/conf/OCTEON1	Mon Sep 13 16:43:41 2010	(r212561)
@@ -34,7 +34,6 @@ makeoptions	LDSCRIPT_NAME=ldscript.mips.
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 makeoptions	TARGET_BIG_ENDIAN=defined
-makeoptions	TARGET_64BIT=defined
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
 include		"../cavium/std.octeon1"

Modified: user/imp/tbemd/sys/powerpc/powerpc/mp_machdep.c
==============================================================================
--- user/imp/tbemd/sys/powerpc/powerpc/mp_machdep.c	Mon Sep 13 16:39:33 2010	(r212560)
+++ user/imp/tbemd/sys/powerpc/powerpc/mp_machdep.c	Mon Sep 13 16:43:41 2010	(r212561)
@@ -94,9 +94,6 @@ machdep_ap_bootstrap(void)
 	/* Start per-CPU event timers. */
 	cpu_initclocks_ap();
 
-	/* Let the DEC and external interrupts go */
-	mtmsr(mfmsr() | PSL_EE);
-
 	/* Announce ourselves awake, and enter the scheduler */
 	sched_throw(NULL);
 }