Sat Jun 27 07:33:51 2020 UTC ()
apply __HIDE_DELAY so zfs and friends at least compile


(macallan)
diff -r1.110 -r1.111 src/sys/arch/powerpc/include/cpu.h
cvs diff -r1.110 -r1.111 src/sys/arch/powerpc/include/cpu.h (expand / switch to unified diff)

--- src/sys/arch/powerpc/include/cpu.h 2019/12/01 15:34:45 1.110
+++ src/sys/arch/powerpc/include/cpu.h 2020/06/27 07:33:51 1.111
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.h,v 1.110 2019/12/01 15:34:45 ad Exp $ */ 1/* $NetBSD: cpu.h,v 1.111 2020/06/27 07:33:51 macallan Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1999 Wolfgang Solfrank. 4 * Copyright (C) 1999 Wolfgang Solfrank.
5 * Copyright (C) 1999 TooLs GmbH. 5 * Copyright (C) 1999 TooLs GmbH.
6 * Copyright (C) 1995-1997 Wolfgang Solfrank. 6 * Copyright (C) 1995-1997 Wolfgang Solfrank.
7 * Copyright (C) 1995-1997 TooLs GmbH. 7 * Copyright (C) 1995-1997 TooLs GmbH.
8 * All rights reserved. 8 * All rights reserved.
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.
@@ -406,28 +406,30 @@ void cpu_boot_secondary_processors(void) @@ -406,28 +406,30 @@ void cpu_boot_secondary_processors(void)
406void cpu_halt(void); 406void cpu_halt(void);
407void cpu_halt_others(void); 407void cpu_halt_others(void);
408void cpu_pause(struct trapframe *); 408void cpu_pause(struct trapframe *);
409void cpu_pause_others(void); 409void cpu_pause_others(void);
410void cpu_resume(cpuid_t); 410void cpu_resume(cpuid_t);
411void cpu_resume_others(void); 411void cpu_resume_others(void);
412int cpu_is_paused(int); 412int cpu_is_paused(int);
413void cpu_debug_dump(void); 413void cpu_debug_dump(void);
414#endif /* MULTIPROCESSOR */ 414#endif /* MULTIPROCESSOR */
415#endif /* !_MODULE */ 415#endif /* !_MODULE */
416 416
417#define cpu_proc_fork(p1, p2) 417#define cpu_proc_fork(p1, p2)
418 418
 419#ifndef __HIDE_DELAY
419#define DELAY(n) delay(n) 420#define DELAY(n) delay(n)
420void delay(unsigned int); 421void delay(unsigned int);
 422#endif /* __HIDE_DELAY */
421 423
422#define CLKF_USERMODE(cf) cpu_clkf_usermode(cf) 424#define CLKF_USERMODE(cf) cpu_clkf_usermode(cf)
423#define CLKF_PC(cf) cpu_clkf_pc(cf) 425#define CLKF_PC(cf) cpu_clkf_pc(cf)
424#define CLKF_INTR(cf) cpu_clkf_intr(cf) 426#define CLKF_INTR(cf) cpu_clkf_intr(cf)
425 427
426bool cpu_clkf_usermode(const struct clockframe *); 428bool cpu_clkf_usermode(const struct clockframe *);
427vaddr_t cpu_clkf_pc(const struct clockframe *); 429vaddr_t cpu_clkf_pc(const struct clockframe *);
428bool cpu_clkf_intr(const struct clockframe *); 430bool cpu_clkf_intr(const struct clockframe *);
429 431
430#define LWP_PC(l) cpu_lwp_pc(l) 432#define LWP_PC(l) cpu_lwp_pc(l)
431 433
432vaddr_t cpu_lwp_pc(struct lwp *); 434vaddr_t cpu_lwp_pc(struct lwp *);
433 435