Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys fix compilation
details: https://anonhg.NetBSD.org/src/rev/f092affe7229
branches: trunk
changeset: 784583:f092affe7229
user: christos <christos%NetBSD.org@localhost>
date: Sat Feb 02 21:02:06 2013 +0000
description:
fix compilation
diffstat:
sys/arch/arm/omap/omapfb.c | 6 +++---
sys/opencrypto/cryptosoft_xform.c | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diffs (53 lines):
diff -r 20171b56b6bf -r f092affe7229 sys/arch/arm/omap/omapfb.c
--- a/sys/arch/arm/omap/omapfb.c Sat Feb 02 20:42:02 2013 +0000
+++ b/sys/arch/arm/omap/omapfb.c Sat Feb 02 21:02:06 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omapfb.c,v 1.18 2013/02/01 02:53:47 macallan Exp $ */
+/* $NetBSD: omapfb.c,v 1.19 2013/02/02 21:02:06 christos Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.18 2013/02/01 02:53:47 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.19 2013/02/02 21:02:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -557,7 +557,7 @@
/* 'regular' framebuffer mmap()ing */
if (offset < sc->sc_vramsize) {
pa = bus_dmamem_mmap(sc->sc_dmat, sc->sc_dmamem, 1,
- offset + 0x1000, prot, BUS_DMA_PREFETCHABLE);
+ offset + 0x1000, prot, BUS_DMA_COHERENT);
return pa;
}
return pa;
diff -r 20171b56b6bf -r f092affe7229 sys/opencrypto/cryptosoft_xform.c
--- a/sys/opencrypto/cryptosoft_xform.c Sat Feb 02 20:42:02 2013 +0000
+++ b/sys/opencrypto/cryptosoft_xform.c Sat Feb 02 21:02:06 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft_xform.c,v 1.25 2011/11/28 08:05:06 tls Exp $ */
+/* $NetBSD: cryptosoft_xform.c,v 1.26 2013/02/02 21:06:31 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/xform.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: xform.c,v 1.19 2002/08/16 22:47:25 dhartmei Exp $ */
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cryptosoft_xform.c,v 1.25 2011/11/28 08:05:06 tls Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cryptosoft_xform.c,v 1.26 2013/02/02 21:06:31 christos Exp $");
#include <crypto/blowfish/blowfish.h>
#include <crypto/cast128/cast128.h>
@@ -55,6 +55,7 @@
#include <sys/rmd160.h>
#include <sys/sha1.h>
#include <sys/sha2.h>
+#include <sys/cprng.h>
#include <opencrypto/aesxcbcmac.h>
#include <opencrypto/gmac.h>
Home |
Main Index |
Thread Index |
Old Index