Fri Jun 9 01:16:54 2017 UTC ()
if __HIDE_DELAY is defined, do not define delay() or DELAY().
needed by dtrace and ZFS.


(chs)
diff -r1.24 -r1.25 src/sys/arch/arm/include/arm32/param.h
diff -r1.71 -r1.72 src/sys/arch/x86/include/cpu.h
cvs diff -r1.24 -r1.25 src/sys/arch/arm/include/arm32/param.h (expand / switch to unified diff)

--- src/sys/arch/arm/include/arm32/param.h 2015/04/02 03:11:01 1.24
+++ src/sys/arch/arm/include/arm32/param.h 2017/06/09 01:16:54 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: param.h,v 1.24 2015/04/02 03:11:01 matt Exp $ */ 1/* $NetBSD: param.h,v 1.25 2017/06/09 01:16:54 chs Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1994,1995 Mark Brinicombe. 4 * Copyright (c) 1994,1995 Mark Brinicombe.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -91,21 +91,23 @@ @@ -91,21 +91,23 @@
91 * addresses at the addresses monitored by the diagnostic code for stack overflows 91 * addresses at the addresses monitored by the diagnostic code for stack overflows
92 * 92 *
93 */ 93 */
94 94
95#define USPACE_SVC_STACK_TOP (USPACE) 95#define USPACE_SVC_STACK_TOP (USPACE)
96#define USPACE_SVC_STACK_BOTTOM (sizeof(struct pcb)) 96#define USPACE_SVC_STACK_BOTTOM (sizeof(struct pcb))
97 97
98#define arm_btop(x) ((unsigned)(x) >> PGSHIFT) 98#define arm_btop(x) ((unsigned)(x) >> PGSHIFT)
99#define arm_ptob(x) ((unsigned)(x) << PGSHIFT) 99#define arm_ptob(x) ((unsigned)(x) << PGSHIFT)
100#define arm_trunc_page(x) ((unsigned)(x) & ~PGOFSET) 100#define arm_trunc_page(x) ((unsigned)(x) & ~PGOFSET)
101  101
102#ifdef _KERNEL 102#ifdef _KERNEL
103#ifndef _LOCORE 103#ifndef _LOCORE
 104#ifndef __HIDE_DELAY
104void delay(unsigned); 105void delay(unsigned);
105#define DELAY(x) delay(x) 106#define DELAY(x) delay(x)
106#endif 107#endif
107#endif 108#endif
 109#endif
108 110
109#include <arm/param.h> 111#include <arm/param.h>
110 112
111#endif /* _ARM_ARM32_PARAM_H_ */ 113#endif /* _ARM_ARM32_PARAM_H_ */
cvs diff -r1.71 -r1.72 src/sys/arch/x86/include/cpu.h (expand / switch to unified diff)

--- src/sys/arch/x86/include/cpu.h 2017/05/23 08:48:34 1.71
+++ src/sys/arch/x86/include/cpu.h 2017/06/09 01:16:54 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.h,v 1.71 2017/05/23 08:48:34 nonaka Exp $ */ 1/* $NetBSD: cpu.h,v 1.72 2017/06/09 01:16:54 chs Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1990 The Regents of the University of California. 4 * Copyright (c) 1990 The Regents of the University of California.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * William Jolitz. 8 * William Jolitz.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -358,28 +358,30 @@ extern void cpu_need_proftick(struct lwp @@ -358,28 +358,30 @@ extern void cpu_need_proftick(struct lwp
358 358
359/* 359/*
360 * Notify the LWP l that it has a signal pending, process as soon as 360 * Notify the LWP l that it has a signal pending, process as soon as
361 * possible. 361 * possible.
362 */ 362 */
363extern void cpu_signotify(struct lwp *); 363extern void cpu_signotify(struct lwp *);
364 364
365/* 365/*
366 * We need a machine-independent name for this. 366 * We need a machine-independent name for this.
367 */ 367 */
368extern void (*delay_func)(unsigned int); 368extern void (*delay_func)(unsigned int);
369struct timeval; 369struct timeval;
370 370
 371#ifndef __HIDE_DELAY
371#define DELAY(x) (*delay_func)(x) 372#define DELAY(x) (*delay_func)(x)
372#define delay(x) (*delay_func)(x) 373#define delay(x) (*delay_func)(x)
 374#endif
373 375
374extern int biosbasemem; 376extern int biosbasemem;
375extern int biosextmem; 377extern int biosextmem;
376extern int cputype; 378extern int cputype;
377extern int cpuid_level; 379extern int cpuid_level;
378extern int cpu_class; 380extern int cpu_class;
379extern char cpu_brand_string[]; 381extern char cpu_brand_string[];
380extern int use_pae; 382extern int use_pae;
381 383
382#ifdef __i386__ 384#ifdef __i386__
383extern int i386_fpu_present; 385extern int i386_fpu_present;
384int npx586bug1(int, int); 386int npx586bug1(int, int);
385extern int i386_fpu_fdivbug; 387extern int i386_fpu_fdivbug;