Module Name: src
Committed By: christos
Date: Wed May 15 16:59:10 UTC 2019
Modified Files:
src/sys/arch/sparc/include: param.h
src/sys/arch/sparc64/include: param.h
Log Message:
From: Tobias Ulmer. Unbreak zfs module build on sparc{,64} by hiding DELAY.
ZFS has a conflicting definition of delay() and tries to hide it by
defining __HIDE_DELAY.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sparc/include/param.h
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/include/param.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/sparc/include/param.h
diff -u src/sys/arch/sparc/include/param.h:1.72 src/sys/arch/sparc/include/param.h:1.73
--- src/sys/arch/sparc/include/param.h:1.72 Mon Jan 7 17:00:32 2019
+++ src/sys/arch/sparc/include/param.h Wed May 15 12:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.72 2019/01/07 22:00:32 jdolecek Exp $ */
+/* $NetBSD: param.h,v 1.73 2019/05/15 16:59:10 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -112,8 +112,12 @@ extern int nbpg, pgofset, pgshift;
#if defined(_KERNEL) || defined(_STANDALONE)
#ifndef _LOCORE
+
+#ifndef __HIDE_DELAY
extern void delay(unsigned int);
#define DELAY(n) delay(n)
+#endif /* __HIDE_DELAY */
+
#endif /* _LOCORE */
/*
Index: src/sys/arch/sparc64/include/param.h
diff -u src/sys/arch/sparc64/include/param.h:1.59 src/sys/arch/sparc64/include/param.h:1.60
--- src/sys/arch/sparc64/include/param.h:1.59 Mon Jan 7 17:00:32 2019
+++ src/sys/arch/sparc64/include/param.h Wed May 15 12:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.59 2019/01/07 22:00:32 jdolecek Exp $ */
+/* $NetBSD: param.h,v 1.60 2019/05/15 16:59:10 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -224,8 +224,10 @@ extern int nbpg, pgofset, pgshift;
#ifdef _KERNEL
#ifndef _LOCORE
+#ifndef __HIDE_DELAY
extern void delay(unsigned int);
#define DELAY(n) delay(n)
+#endif /* __HIDE_DELAY */
#ifdef __arch64__
/* If we're using a 64-bit kernel use 64-bit math */
