PERFORCE change 72934 for review
Peter Wemm
peter at FreeBSD.org
Fri Mar 11 14:26:37 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=72934
Change 72934 by peter at peter_daintree on 2005/03/11 22:25:33
IFC @72933
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/fpu.c#26 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#46 integrate
.. //depot/projects/hammer/sys/amd64/include/_types.h#13 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#14 integrate
.. //depot/projects/hammer/sys/amd64/include/cpufunc.h#32 integrate
.. //depot/projects/hammer/sys/amd64/include/critical.h#20 integrate
.. //depot/projects/hammer/sys/amd64/include/endian.h#13 integrate
.. //depot/projects/hammer/sys/amd64/include/in_cksum.h#13 integrate
.. //depot/projects/hammer/sys/amd64/include/pcpu.h#22 integrate
.. //depot/projects/hammer/sys/amd64/include/profile.h#27 integrate
.. //depot/projects/hammer/sys/amd64/include/stdarg.h#10 integrate
.. //depot/projects/hammer/sys/amd64/include/varargs.h#11 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#35 integrate
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/critical.h#8 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#22 integrate
.. //depot/projects/hammer/sys/kern/uipc_accf.c#7 integrate
.. //depot/projects/hammer/sys/modules/Makefile#69 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#26 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.156 2005/03/02 21:33:21 joerg Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#46 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.12 2005/02/28 23:37:35 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.13 2005/03/11 22:12:38 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/include/_types.h#13 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/amd64/include/_types.h,v 1.7 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.8 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE__TYPES_H_
==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#14 (text+ko) ====
@@ -67,7 +67,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/amd64/include/bus_amd64.h,v 1.28 2005/03/02 21:33:21 joerg Exp $ */
+/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.29 2005/03/11 22:16:09 peter Exp $ */
#ifndef _AMD64_BUS_AMD64_H_
#define _AMD64_BUS_AMD64_H_
==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#32 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.146 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.147 2005/03/11 22:16:09 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/include/critical.h#20 (text+ko) ====
@@ -33,7 +33,7 @@
* related support functions residing
* in <arch>/<arch>/critical.c - prototyped
*
- * $FreeBSD: src/sys/amd64/include/critical.h,v 1.9 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/critical.h,v 1.10 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE_CRITICAL_H_
==== //depot/projects/hammer/sys/amd64/include/endian.h#13 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)endian.h 7.8 (Berkeley) 4/3/91
- * $FreeBSD: src/sys/amd64/include/endian.h,v 1.7 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $
*/
#ifndef _MACHINE_ENDIAN_H_
@@ -36,6 +36,10 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Define the order of 32-bit words in 64-bit words.
*/
@@ -188,4 +192,8 @@
#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
+#ifdef __cplusplus
+}
+#endif
+
#endif /* !_MACHINE_ENDIAN_H_ */
==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#13 (text+ko) ====
@@ -29,7 +29,7 @@
* from tahoe: in_cksum.c 1.2 86/01/05
* from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91
* from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.4 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.5 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE_IN_CKSUM_H_
==== //depot/projects/hammer/sys/amd64/include/pcpu.h#22 (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/amd64/include/pcpu.h,v 1.43 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE_PCPU_H_
==== //depot/projects/hammer/sys/amd64/include/profile.h#27 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/i386/include/profile.h,v 1.40 2005/03/02 21:33:26 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/profile.h,v 1.45 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE_PROFILE_H_
==== //depot/projects/hammer/sys/amd64/include/stdarg.h#10 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.7 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.8 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE_STDARG_H_
==== //depot/projects/hammer/sys/amd64/include/varargs.h#11 (text+ko) ====
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)varargs.h 8.2 (Berkeley) 3/22/94
- * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.13 2005/03/02 21:33:21 joerg Exp $
+ * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.14 2005/03/11 22:16:09 peter Exp $
*/
#ifndef _MACHINE_VARARGS_H_
==== //depot/projects/hammer/sys/amd64/isa/clock.c#35 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.216 2005/02/28 23:37:35 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.217 2005/03/11 21:57:38 peter Exp $");
/*
* Routines to handle clock hardware.
@@ -832,7 +832,7 @@
if (count < i8254_lastcount ||
(!i8254_ticked && (clkintr_pending ||
((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) &&
- i8254_intsrc != NULL && i8254_pending(i8254_intsrc))))) {
+ i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
i8254_ticked = 1;
i8254_offset += timer0_max_count;
}
==== //depot/projects/hammer/sys/crypto/rijndael/rijndael.h#4 (text+ko) ====
@@ -1,5 +1,5 @@
/* $KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $ */
-/* $FreeBSD: src/sys/crypto/rijndael/rijndael.h,v 1.5 2005/03/11 17:24:46 ume Exp $ */
+/* $FreeBSD: src/sys/crypto/rijndael/rijndael.h,v 1.6 2005/03/11 22:07:04 ume Exp $ */
/**
* rijndael-alg-fst.h
@@ -45,13 +45,11 @@
void rijndael_decrypt(const rijndael_ctx *, const u_char *, u_char *);
void rijndael_encrypt(const rijndael_ctx *, const u_char *, u_char *);
-#ifdef _KERNEL
int rijndaelKeySetupEnc(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int);
int rijndaelKeySetupDec(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int);
void rijndaelEncrypt(const u_int32_t [/*4*(Nr+1)*/], int,
const u_int8_t[16], u_int8_t [16]);
void rijndaelDecrypt(const u_int32_t [/*4*(Nr+1)*/], int,
const u_int8_t [16], u_int8_t [16]);
-#endif
#endif /* __RIJNDAEL_H */
==== //depot/projects/hammer/sys/i386/include/critical.h#8 (text+ko) ====
@@ -33,7 +33,7 @@
* related support functions residing
* in <arch>/<arch>/critical.c - prototyped
*
- * $FreeBSD: src/sys/i386/include/critical.h,v 1.9 2005/03/02 21:33:26 joerg Exp $
+ * $FreeBSD: src/sys/i386/include/critical.h,v 1.10 2005/03/11 21:42:11 peter Exp $
*/
#ifndef _MACHINE_CRITICAL_H_
@@ -53,14 +53,11 @@
*
* This routine is called from critical_enter() on the 0->1 transition
* of td_critnest, prior to it being incremented to 1.
- *
- * If new-style critical section handling we do not have to do anything.
- * However, as a side effect any interrupts occuring while td_critnest
- * is non-zero will be deferred.
*/
static __inline void
cpu_critical_enter(struct thread *td)
{
+
td->td_md.md_savecrit = intr_disable();
}
@@ -70,10 +67,6 @@
* This routine is called from critical_exit() on a 1->0 transition
* of td_critnest, after it has been decremented to 0. We are
* exiting the last critical section.
- *
- * Note that the td->critnest (1->0) transition interrupt race against
- * our int_pending/unpend() check below is handled by the interrupt
- * code for us, so we do not have to do anything fancy.
*/
static __inline void
cpu_critical_exit(struct thread *td)
==== //depot/projects/hammer/sys/i386/isa/clock.c#22 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.216 2005/03/09 15:33:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.217 2005/03/11 22:10:25 peter Exp $");
/*
* Routines to handle clock hardware.
@@ -98,7 +98,6 @@
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
-
int adjkerntz; /* local offset from GMT in seconds */
int clkintr_pending;
int disable_rtc_set; /* disable resettodr() if != 0 */
@@ -169,7 +168,6 @@
#endif
}
-
int
acquire_timer2(int mode)
{
@@ -190,7 +188,6 @@
return (0);
}
-
int
release_timer2()
{
==== //depot/projects/hammer/sys/kern/uipc_accf.c#7 (text+ko) ====
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2000 Paycounter, Inc.
+ * Copyright (c) 2005 Robert N. M. Watson
* Author: Alfred Perlstein <alfred at paycounter.com>, <alfred at FreeBSD.org>
* All rights reserved.
*
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.15 2005/02/18 19:01:22 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.16 2005/03/11 21:37:45 rwatson Exp $");
#define ACCEPT_FILTER_MOD
@@ -169,33 +170,23 @@
struct so_accf *newaf;
int error = 0;
- newaf = NULL;
- afap = NULL;
-
/*
- * XXXRW: Configuring accept filters should be an atomic test-and-set
- * operation to prevent races during setup and attach. There may be
- * more general issues of racing and ordering here that are not yet
- * addressed by locking.
+ * Handle the simple delete case first.
*/
- /* do not set/remove accept filters on non listen sockets */
- SOCK_LOCK(so);
- if ((so->so_options & SO_ACCEPTCONN) == 0) {
- SOCK_UNLOCK(so);
- return (EINVAL);
- }
-
- /* removing the filter */
if (sopt == NULL) {
+ SOCK_LOCK(so);
+ if ((so->so_options & SO_ACCEPTCONN) == 0) {
+ SOCK_UNLOCK(so);
+ return (EINVAL);
+ }
if (so->so_accf != NULL) {
struct so_accf *af = so->so_accf;
if (af->so_accept_filter != NULL &&
af->so_accept_filter->accf_destroy != NULL) {
af->so_accept_filter->accf_destroy(so);
}
- if (af->so_accept_filter_str != NULL) {
+ if (af->so_accept_filter_str != NULL)
FREE(af->so_accept_filter_str, M_ACCF);
- }
FREE(af, M_ACCF);
so->so_accf = NULL;
}
@@ -203,6 +194,22 @@
SOCK_UNLOCK(so);
return (0);
}
+
+ newaf = NULL;
+ afap = NULL;
+
+ /*
+ * XXXRW: Configuring accept filters should be an atomic test-and-set
+ * operation to prevent races during setup and attach. There may be
+ * more general issues of racing and ordering here that are not yet
+ * addressed by locking.
+ */
+ /* do not set/remove accept filters on non listen sockets */
+ SOCK_LOCK(so);
+ if ((so->so_options & SO_ACCEPTCONN) == 0) {
+ SOCK_UNLOCK(so);
+ return (EINVAL);
+ }
SOCK_UNLOCK(so);
/*-
==== //depot/projects/hammer/sys/modules/Makefile#69 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.430 2005/03/11 01:39:56 sam Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.431 2005/03/11 19:40:34 sam Exp $
# oldcard -- specialized use for debugging only.
# owi -- totally unsupported for debugging only.
@@ -26,8 +26,8 @@
ath \
${_ath_hal} \
ath_rate_amrr \
+ ath_rate_sample \
ath_rate_onoe \
- ath_rate_sample \
aue \
${_auxio} \
${_awi} \
More information about the p4-projects
mailing list