Module Name: src
Committed By: snj
Date: Sat Mar 11 16:03:55 UTC 2017
Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/sys/arch/arm/arm32 [netbsd-7]: pmap.c
Log Message:
fix fallout from ticket #1366: __nothing is nothing on netbsd-7
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.164 -r1.1.2.165 src/doc/CHANGES-7.1
cvs rdiff -u -r1.295.2.9 -r1.295.2.10 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.164 src/doc/CHANGES-7.1:1.1.2.165
--- src/doc/CHANGES-7.1:1.1.2.164 Sat Mar 11 08:49:11 2017
+++ src/doc/CHANGES-7.1 Sat Mar 11 16:03:55 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.164 2017/03/11 08:49:11 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.165 2017/03/11 16:03:55 snj Exp $
A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
release:
@@ -8976,7 +8976,7 @@ sys/dev/pci/if_wmvar.h 1.33
- Fix typo in comment.
[msaitoh, ticket #1372]
-sys/arch/arm/arm32/pmap.c 1.343, 1.344
+sys/arch/arm/arm32/pmap.c 1.343, 1.344 via patch
sys/arch/arm/include/arm32/pmap.h 1.145
sys/arch/evbarm/gumstix/gumstix_machdep.c 1.58 via patch
@@ -9000,7 +9000,7 @@ sys/conf/copyright 1.14, 1.15
distrib/notes/common/main patched by hand
gnu/usr.bin/groff/tmac/mdoc.local patched by hand
-sys/sys/param.h i patched by hand
+sys/sys/param.h patched by hand
Welcome to 7.1!
[snj]
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.295.2.9 src/sys/arch/arm/arm32/pmap.c:1.295.2.10
--- src/sys/arch/arm/arm32/pmap.c:1.295.2.9 Sat Mar 11 07:40:21 2017
+++ src/sys/arch/arm/arm32/pmap.c Sat Mar 11 16:03:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.295.2.9 2017/03/11 07:40:21 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.295.2.10 2017/03/11 16:03:54 snj Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include <arm/locore.h>
//#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.295.2.9 2017/03/11 07:40:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.295.2.10 2017/03/11 16:03:54 snj Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -979,7 +979,7 @@ pmap_pte_sync_current(pmap_t pm, pt_entr
# define PTE_SYNC_CURRENT(pm, ptep) pmap_pte_sync_current(pm, ptep)
#else
-# define PTE_SYNC_CURRENT(pm, ptep) __nothing
+# define PTE_SYNC_CURRENT(pm, ptep) /* nothing */
#endif
/*
