[src/trunk]: src/sys/arch/mips Don't include <machine/param.h> in .S files, g...

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

details:   https://anonhg.NetBSD.org/src/rev/7bd42da97f6b
branches:  trunk
changeset: 338836:7bd42da97f6b
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jun 11 07:30:10 2015 +0000

description:
Don't include <machine/param.h> in .S files, get the needed values from assym.h
Define NBPG as UL to avoid integer over with NBXSEG on LP64 systems.
(.S files don't like numbers with UL appended to them).

diffstat:

 sys/arch/mips/include/mips_param.h |  6 +++---
 sys/arch/mips/mips/locore.S        |  3 +--
 sys/arch/mips/mips/locore_mips1.S  |  3 +--
 sys/arch/mips/mips/locore_mips3.S  |  3 +--
 sys/arch/mips/mips/mipsX_subr.S    |  4 +---
 sys/arch/mips/mips/spl.S           |  5 ++---
 6 files changed, 9 insertions(+), 15 deletions(-)

diffs (113 lines):

diff -r f66c0ffed124 -r 7bd42da97f6b sys/arch/mips/include/mips_param.h
--- a/sys/arch/mips/include/mips_param.h        Thu Jun 11 05:28:42 2015 +0000
+++ b/sys/arch/mips/include/mips_param.h        Thu Jun 11 07:30:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_param.h,v 1.35 2015/06/07 06:07:49 matt Exp $     */
+/*     $NetBSD: mips_param.h,v 1.36 2015/06/11 07:30:10 matt Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -92,10 +92,10 @@
 #endif
 
 #ifdef ENABLE_MIPS_16KB_PAGE
-#define        NBPG            16384           /* bytes/page */
+#define        NBPG            16384UL         /* bytes/page */
 #define        PGSHIFT         14              /* LOG2(NBPG) */
 #else
-#define        NBPG            4096            /* bytes/page */
+#define        NBPG            4096UL          /* bytes/page */
 #define        PGSHIFT         12              /* LOG2(NBPG) */
 #endif
 #define        PGOFSET         (NBPG-1)        /* byte offset into page */
diff -r f66c0ffed124 -r 7bd42da97f6b sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Thu Jun 11 05:28:42 2015 +0000
+++ b/sys/arch/mips/mips/locore.S       Thu Jun 11 07:30:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.196 2015/06/07 08:03:10 matt Exp $        */
+/*     $NetBSD: locore.S,v 1.197 2015/06/11 07:30:10 matt Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,7 +58,6 @@
 #include <sys/cdefs.h>
 #include <sys/errno.h>
 
-#include <machine/param.h>
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
 #include <mips/trap.h>
diff -r f66c0ffed124 -r 7bd42da97f6b sys/arch/mips/mips/locore_mips1.S
--- a/sys/arch/mips/mips/locore_mips1.S Thu Jun 11 05:28:42 2015 +0000
+++ b/sys/arch/mips/mips/locore_mips1.S Thu Jun 11 07:30:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_mips1.S,v 1.84 2012/02/19 21:06:17 rmind Exp $  */
+/*     $NetBSD: locore_mips1.S,v 1.85 2015/06/11 07:30:10 matt Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -56,7 +56,6 @@
 
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
-#include <machine/param.h>
 
 #include "assym.h"
 
diff -r f66c0ffed124 -r 7bd42da97f6b sys/arch/mips/mips/locore_mips3.S
--- a/sys/arch/mips/mips/locore_mips3.S Thu Jun 11 05:28:42 2015 +0000
+++ b/sys/arch/mips/mips/locore_mips3.S Thu Jun 11 07:30:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_mips3.S,v 1.108 2015/06/07 08:03:10 matt Exp $  */
+/*     $NetBSD: locore_mips3.S,v 1.109 2015/06/11 07:30:10 matt Exp $  */
 
 /*
  * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -91,7 +91,6 @@
 
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
-#include <machine/param.h>
 
 #include "assym.h"
 
diff -r f66c0ffed124 -r 7bd42da97f6b sys/arch/mips/mips/mipsX_subr.S
--- a/sys/arch/mips/mips/mipsX_subr.S   Thu Jun 11 05:28:42 2015 +0000
+++ b/sys/arch/mips/mips/mipsX_subr.S   Thu Jun 11 07:30:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mipsX_subr.S,v 1.61 2015/06/09 14:40:42 matt Exp $     */
+/*     $NetBSD: mipsX_subr.S,v 1.62 2015/06/11 07:30:10 matt Exp $     */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -132,8 +132,6 @@
 #endif
 #include <mips/trap.h>
 
-#include <machine/param.h>
-
 #include "assym.h"
 
 #ifdef _LP64
diff -r f66c0ffed124 -r 7bd42da97f6b sys/arch/mips/mips/spl.S
--- a/sys/arch/mips/mips/spl.S  Thu Jun 11 05:28:42 2015 +0000
+++ b/sys/arch/mips/mips/spl.S  Thu Jun 11 07:30:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spl.S,v 1.8 2015/06/06 04:40:19 matt Exp $     */
+/*     $NetBSD: spl.S,v 1.9 2015/06/11 07:30:10 matt Exp $     */
 
 /*-
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -35,11 +35,10 @@
 
 #include <sys/cdefs.h>
 
-#include <machine/param.h>
 #include <mips/asm.h>
 #include <mips/cpuregs.h>
 
-RCSID("$NetBSD: spl.S,v 1.8 2015/06/06 04:40:19 matt Exp $")
+RCSID("$NetBSD: spl.S,v 1.9 2015/06/11 07:30:10 matt Exp $")
 
 #include "assym.h"