Date: Mon, 5 Jun 2006 13:29:17 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 98553 for review Message-ID: <200606051329.k55DTHGE087779@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=98553 Change 98553 by rwatson@rwatson_zoo on 2006/06/05 13:28:21 Integrate TrustedBSD audit3 branch to loop back various audit-related changes: - Merge OpenBSM 1.0 alpha 6 changes into src/sys/bsm, src/sys/security/audit. - Audit accounting setup. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.9 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.10 2006/06/05 11:55:20 nyan Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -413,8 +413,11 @@ acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc, ACPI_HANDLE h, UINT32 key) { + struct acpi_softc *acpi_sc; int arg, max, min; + acpi_sc = acpi_device_get_parent_softc(sc->dev); + ACPI_SERIAL_ASSERT(panasonic); switch (key) { case 1: @@ -450,6 +453,10 @@ arg = 1; hkey_sound_mute(h, HKEY_SET, &arg); break; + case 7: + /* Suspend. */ + acpi_SetSleepState(acpi_sc, ACPI_STATE_S3); + break; } } ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.81 2006/03/28 21:26:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.82 2006/06/05 13:02:34 rwatson Exp $"); #include "opt_mac.h" ==== //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.375 2006/05/11 17:29:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.376 2006/06/05 11:53:36 nyan Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -2540,6 +2540,10 @@ bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); } #ifdef DEV_NPX +#ifdef CPU_ENABLE_SSE + if (cpu_fxsr) + addr->sv_xmm.sv_env.en_mxcsr &= cpu_mxcsr_mask; +#endif /* * XXX we violate the dubious requirement that npxsetregs() * be called with interrupts disabled. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.4 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm.c,v 1.5 2006/06/05 13:13:02 rwatson Exp $ */ #include <sys/param.h> ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 (text+ko) ==== @@ -30,8 +30,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 $ - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ #include <sys/types.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606051329.k55DTHGE087779>