Module Name: src
Committed By: riastradh
Date: Mon Jun 29 23:58:44 UTC 2020
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/x86/x86: via_padlock.c
Log Message:
Make padlock(4) compile on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/via_padlock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.154 src/sys/arch/amd64/conf/ALL:1.155
--- src/sys/arch/amd64/conf/ALL:1.154 Wed Jun 24 03:38:54 2020
+++ src/sys/arch/amd64/conf/ALL Mon Jun 29 23:58:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.154 2020/06/24 03:38:54 thorpej Exp $
+# $NetBSD: ALL,v 1.155 2020/06/29 23:58:44 riastradh Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.154 $"
+#ident "ALL-$Revision: 1.155 $"
maxusers 64 # estimated number of users
@@ -35,7 +35,7 @@ acpicpu* at cpu? # ACPI CPU (including
coretemp* at cpu? # Intel on-die thermal sensor
est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
odcm0 at cpu0 # On-demand clock modulation
-#padlock0 at cpu0 # VIA PadLock
+padlock0 at cpu0 # VIA PadLock
powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp* at cpu? # VIA C7 temperature sensor
vmt0 at cpu0 # VMware Tools
Index: src/sys/arch/x86/x86/via_padlock.c
diff -u src/sys/arch/x86/x86/via_padlock.c:1.30 src/sys/arch/x86/x86/via_padlock.c:1.31
--- src/sys/arch/x86/x86/via_padlock.c:1.30 Mon Jun 29 23:38:02 2020
+++ src/sys/arch/x86/x86/via_padlock.c Mon Jun 29 23:58:44 2020
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.30 2020/06/29 23:38:02 riastradh Exp $ */
+/* $NetBSD: via_padlock.c,v 1.31 2020/06/29 23:58:44 riastradh Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.30 2020/06/29 23:38:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.31 2020/06/29 23:58:44 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -351,7 +351,7 @@ via_padlock_cbc(void *cw, void *src, voi
lcr0(cr0 & ~(CR0_EM|CR0_TS));
/* Do the deed */
- __asm __volatile("pushfl; popfl"); /* force key reload */
+ __asm __volatile("pushf; popf"); /* force key reload */
__asm __volatile(".byte 0xf3, 0x0f, 0xa7, 0xd0" : /* rep xcrypt-cbc */
: "a" (iv), "b" (key), "c" (rep), "d" (cw), "S" (src), "D" (dst)
: "memory", "cc");
