PERFORCE change 102653 for review
John Baldwin
jhb at FreeBSD.org
Fri Jul 28 15:18:54 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102653
Change 102653 by jhb at jhb_mutex on 2006/07/28 15:18:05
IFC @102650.
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#48 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#18 integrate
.. //depot/projects/smpng/sys/arm/arm/trap.c#21 integrate
.. //depot/projects/smpng/sys/conf/files#183 integrate
.. //depot/projects/smpng/sys/crypto/via/padlock.c#7 integrate
.. //depot/projects/smpng/sys/crypto/via/padlock.h#2 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#114 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#97 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#14 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#85 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#134 integrate
.. //depot/projects/smpng/sys/kern/kern_rwlock.c#8 integrate
.. //depot/projects/smpng/sys/kern/kern_sx.c#35 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#54 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#70 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/trap.c#48 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.305 2006/07/27 22:32:28 jhb Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#18 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.13 2006/07/27 21:25:49 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.14 2006/07/27 22:32:29 jhb Exp $");
/*
* 386 Trap and System call handling
==== //depot/projects/smpng/sys/arm/arm/trap.c#21 (text+ko) ====
@@ -82,7 +82,7 @@
#include "opt_ktrace.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.24 2006/04/09 20:16:47 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.25 2006/07/27 22:32:29 jhb Exp $");
#include <sys/types.h>
==== //depot/projects/smpng/sys/conf/files#183 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1133 2006/07/25 02:15:28 rwatson Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1134 2006/07/27 22:32:29 jhb Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/smpng/sys/crypto/via/padlock.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.10 2006/07/25 19:04:26 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.11 2006/07/28 14:48:30 pjd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,7 +113,7 @@
free(padlock_sc, M_PADLOCK);
padlock_sc = NULL;
return (ENOMEM);
- }
+ }
mtx_init(&sc->sc_sessions_mtx, "padlock_mtx", NULL, MTX_DEF);
crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0, padlock_newsession,
==== //depot/projects/smpng/sys/crypto/via/padlock.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/crypto/via/padlock.h,v 1.3 2006/07/25 19:06:54 pjd Exp $
+ * $FreeBSD: src/sys/crypto/via/padlock.h,v 1.4 2006/07/28 14:46:19 pjd Exp $
*/
#ifndef _PADLOCK_H_
@@ -72,7 +72,7 @@
TAILQ_ENTRY(padlock_session) ses_next;
};
-#define PADLOCK_ALIGN(p) (void *)((uintptr_t)(p) - (((uintptr_t)(p) - 1) % 16) + 15)
+#define PADLOCK_ALIGN(p) (void *)(roundup2((uintptr_t)(p), 16))
int padlock_cipher_setup(struct padlock_session *ses,
struct cryptoini *encini);
==== //depot/projects/smpng/sys/i386/i386/machdep.c#114 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.631 2006/07/27 19:47:22 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.632 2006/07/27 22:19:02 jhb Exp $");
#include "opt_apic.h"
#include "opt_atalk.h"
==== //depot/projects/smpng/sys/i386/i386/trap.c#97 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.292 2006/06/20 12:44:20 yar Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.293 2006/07/27 22:32:29 jhb Exp $");
/*
* 386 Trap and System call handling
==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.9 2006/07/27 21:25:49 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.10 2006/07/27 22:32:29 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/smpng/sys/ia64/ia64/trap.c#85 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.120 2006/07/27 21:25:50 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.121 2006/07/27 22:32:29 jhb Exp $");
#include "opt_ddb.h"
#include "opt_ktrace.h"
==== //depot/projects/smpng/sys/kern/kern_mutex.c#134 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.174 2006/07/27 19:58:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.175 2006/07/27 21:45:55 jhb Exp $");
#include "opt_adaptive_mutexes.h"
#include "opt_ddb.h"
==== //depot/projects/smpng/sys/kern/kern_rwlock.c#8 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.9 2006/04/19 21:06:52 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.10 2006/07/27 21:45:55 jhb Exp $");
#include "opt_ddb.h"
==== //depot/projects/smpng/sys/kern/kern_sx.c#35 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.28 2006/01/17 16:55:16 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.29 2006/07/27 21:45:55 jhb Exp $");
#include "opt_ddb.h"
==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#54 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.58 2006/07/27 19:50:16 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.59 2006/07/27 22:32:30 jhb Exp $");
#include "opt_ktrace.h"
==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#70 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.82 2006/05/16 14:32:17 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.83 2006/07/27 22:32:30 jhb Exp $");
#include "opt_ddb.h"
#include "opt_ktr.h"
More information about the p4-projects
mailing list