[src/trunk]: src/sys/arch if __HIDE_DELAY is defined, do not define delay() o...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8aa18d0c4796
branches:  trunk
changeset: 824568:8aa18d0c4796
user:      chs <chs%NetBSD.org@localhost>
date:      Fri Jun 09 01:16:54 2017 +0000

description:
if __HIDE_DELAY is defined, do not define delay() or DELAY().
needed by dtrace and ZFS.

diffstat:

 sys/arch/arm/include/arm32/param.h |  4 +++-
 sys/arch/x86/include/cpu.h         |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r d9060e7afba0 -r 8aa18d0c4796 sys/arch/arm/include/arm32/param.h
--- a/sys/arch/arm/include/arm32/param.h        Fri Jun 09 01:16:33 2017 +0000
+++ b/sys/arch/arm/include/arm32/param.h        Fri Jun 09 01:16:54 2017 +0000
@@ -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>
 
diff -r d9060e7afba0 -r 8aa18d0c4796 sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h        Fri Jun 09 01:16:33 2017 +0000
+++ b/sys/arch/x86/include/cpu.h        Fri Jun 09 01:16:54 2017 +0000
@@ -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 (*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;