Module Name: src
Committed By: chs
Date: Fri Jun 9 01:16:54 UTC 2017
Modified Files:
src/sys/arch/arm/include/arm32: param.h
src/sys/arch/x86/include: cpu.h
Log Message:
if __HIDE_DELAY is defined, do not define delay() or DELAY().
needed by dtrace and ZFS.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/arm32/param.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/include/cpu.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/arm/include/arm32/param.h
diff -u src/sys/arch/arm/include/arm32/param.h:1.24 src/sys/arch/arm/include/arm32/param.h:1.25
--- src/sys/arch/arm/include/arm32/param.h:1.24 Thu Apr 2 03:11:01 2015
+++ src/sys/arch/arm/include/arm32/param.h Fri Jun 9 01:16:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.24 2015/04/02 03:11:01 matt Exp $ */
+/* $NetBSD: param.h,v 1.25 2017/06/09 01:16:54 chs Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -101,10 +101,12 @@
#ifdef _KERNEL
#ifndef _LOCORE
+#ifndef __HIDE_DELAY
void delay(unsigned);
#define DELAY(x) delay(x)
#endif
#endif
+#endif
#include <arm/param.h>
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.71 src/sys/arch/x86/include/cpu.h:1.72
--- src/sys/arch/x86/include/cpu.h:1.71 Tue May 23 08:48:34 2017
+++ src/sys/arch/x86/include/cpu.h Fri Jun 9 01:16:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.71 2017/05/23 08:48:34 nonaka Exp $ */
+/* $NetBSD: cpu.h,v 1.72 2017/06/09 01:16:54 chs Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -368,8 +368,10 @@ extern void cpu_signotify(struct lwp *);
extern void (*delay_func)(unsigned int);
struct timeval;
+#ifndef __HIDE_DELAY
#define DELAY(x) (*delay_func)(x)
#define delay(x) (*delay_func)(x)
+#endif
extern int biosbasemem;
extern int biosextmem;
