Module Name: src
Committed By: christos
Date: Fri Apr 22 18:13:01 UTC 2016
Modified Files:
src/sys/arch/evbarm/conf: RPI
src/sys/arch/macppc/stand/ofwboot: Locore.c
src/sys/arch/vax/include: bus.h
Log Message:
Elide unused variable warnings (Felix Deichmann)
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/macppc/stand/ofwboot/Locore.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/include/bus.h
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/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.65 src/sys/arch/evbarm/conf/RPI:1.66
--- src/sys/arch/evbarm/conf/RPI:1.65 Sun Oct 4 06:16:39 2015
+++ src/sys/arch/evbarm/conf/RPI Fri Apr 22 14:13:01 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.65 2015/10/04 10:16:39 skrll Exp $
+# $NetBSD: RPI,v 1.66 2016/04/22 18:13:01 christos Exp $
#
# RPi -- Raspberry Pi
#
@@ -29,6 +29,10 @@ options USB_DEBUG
#options DWC2_DEBUG
#options UHUB_DEBUG
+# DTrace
+options INSECURE # module loading
+options DTRACE_HOOKS
+
# Valid options for BOOT_ARGS:
# single Boot to single user only
Index: src/sys/arch/macppc/stand/ofwboot/Locore.c
diff -u src/sys/arch/macppc/stand/ofwboot/Locore.c:1.27 src/sys/arch/macppc/stand/ofwboot/Locore.c:1.28
--- src/sys/arch/macppc/stand/ofwboot/Locore.c:1.27 Sun Mar 13 04:57:10 2016
+++ src/sys/arch/macppc/stand/ofwboot/Locore.c Fri Apr 22 14:13:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.27 2016/03/13 08:57:10 tsutsui Exp $ */
+/* $NetBSD: Locore.c,v 1.28 2016/04/22 18:13:01 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -143,7 +143,13 @@ __asm(
" \n"
"5: cmpw 0,%r8,%r9 \n"
" bge 6f \n"
-" stw %r0,0(%r8) \n"
+ /*
+ * clear by bytes to avoid ppc601 alignment exceptions
+ */
+" stb %r0,0(%r8) \n"
+" stb %r0,1(%r8) \n"
+" stb %r0,2(%r8) \n"
+" stb %r0,3(%r8) \n"
" addi %r8,%r8,4 \n"
" b 5b \n"
" \n"
Index: src/sys/arch/vax/include/bus.h
diff -u src/sys/arch/vax/include/bus.h:1.32 src/sys/arch/vax/include/bus.h:1.33
--- src/sys/arch/vax/include/bus.h:1.32 Sat Jul 4 22:03:36 2015
+++ src/sys/arch/vax/include/bus.h Fri Apr 22 14:13:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.32 2015/07/05 02:03:36 matt Exp $ */
+/* $NetBSD: bus.h,v 1.33 2016/04/22 18:13:01 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -205,15 +205,15 @@ struct vax_bus_space {
*/
#define bus_space_read_1(t, h, o) \
- (*(volatile uint8_t *)((h) + (o)))
+ (__USE(t), (*(volatile uint8_t *)((h) + (o))))
#define bus_space_read_2(t, h, o) \
(__BUS_SPACE_ADDRESS_SANITY((h) + (o), uint16_t, "bus addr"), \
- (*(volatile uint16_t *)((h) + (o))))
+ __USE(t), (*(volatile uint16_t *)((h) + (o))))
#define bus_space_read_4(t, h, o) \
(__BUS_SPACE_ADDRESS_SANITY((h) + (o), uint32_t, "bus addr"), \
- (*(volatile uint32_t *)((h) + (o))))
+ __USE(t), (*(volatile uint32_t *)((h) + (o))))
#if 0 /* Cause a link error for bus_space_read_8 */
#define bus_space_read_8(t, h, o) !!! bus_space_read_8 unimplemented !!!
@@ -368,18 +368,21 @@ vax_mem_read_region_4(bus_space_tag_t t,
#define bus_space_write_1(t, h, o, v) \
do { \
+ __USE(t); \
((void)(*(volatile uint8_t *)((h) + (o)) = (v))); \
} while (0)
#define bus_space_write_2(t, h, o, v) \
do { \
__BUS_SPACE_ADDRESS_SANITY((h) + (o), uint16_t, "bus addr"); \
+ __USE(t); \
((void)(*(volatile uint16_t *)((h) + (o)) = (v))); \
} while (0)
#define bus_space_write_4(t, h, o, v) \
do { \
__BUS_SPACE_ADDRESS_SANITY((h) + (o), uint32_t, "bus addr"); \
+ __USE(t); \
((void)(*(volatile uint32_t *)((h) + (o)) = (v))); \
} while (0)
