Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/include swap sys/param.h for machine/param.h. ...



details:   https://anonhg.NetBSD.org/src/rev/963c7b912bbe
branches:  trunk
changeset: 974928:963c7b912bbe
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 17 01:52:59 2020 +0000

description:
swap sys/param.h for machine/param.h.  this still obtains the
wanted COHERENCY_UNIT, while avoiding have a cascade of
failures where sys/mutex.h ends up including arm/cpu.h which
ends up including sys/resourcevar.h and then sys/mutex.h,
but as the first includer of sys/mutex.h has defined the
idempotent header define, the second one is empty, and as
kmutex_t isn't defined by the first attempt yet the kmutex_t
used in resourcevar.h generates an error.

should fix evbarm v5/v5eb, hpcarm, iyonix and zaurus builds.

tested building iyonix, zaurus and evbarmv7hf.

diffstat:

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

diffs (18 lines):

diff -r 6409cbff727c -r 963c7b912bbe sys/arch/arm/include/cpu.h
--- a/sys/arch/arm/include/cpu.h        Mon Aug 17 00:57:37 2020 +0000
+++ b/sys/arch/arm/include/cpu.h        Mon Aug 17 01:52:59 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.113 2020/08/16 16:01:35 skrll Exp $  */
+/*     $NetBSD: cpu.h,v 1.114 2020/08/17 01:52:59 mrg Exp $    */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -154,7 +154,7 @@
 #include <sys/cpu_data.h>
 #include <sys/device_if.h>
 #include <sys/evcnt.h>
-#include <sys/param.h>
+#include <machine/param.h>
 
 struct cpu_info {
        struct cpu_data ci_data;        /* MI per-cpu data */



Home | Main Index | Thread Index | Old Index