Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/powerpc Turn imask into static.



details:   https://anonhg.NetBSD.org/src/rev/8e15cce0ccba
branches:  trunk
changeset: 953254:8e15cce0ccba
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Mar 02 07:37:27 2021 +0000

description:
Turn imask into static.

XXX
Other macro etc. in powerpc/intr.h should also be moved into
powerpc/pic/intr.c, or protected by __INTR_PRIVATE.

diffstat:

 sys/arch/powerpc/include/intr.h |  6 ++----
 sys/arch/powerpc/pic/intr.c     |  6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r cf117f341d3a -r 8e15cce0ccba sys/arch/powerpc/include/intr.h
--- a/sys/arch/powerpc/include/intr.h   Tue Mar 02 07:27:24 2021 +0000
+++ b/sys/arch/powerpc/include/intr.h   Tue Mar 02 07:37:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.17 2020/04/16 23:29:52 rin Exp $ */
+/*     $NetBSD: intr.h,v 1.18 2021/03/02 07:37:27 rin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -28,7 +28,7 @@
 
 #ifndef _LOCORE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.17 2020/04/16 23:29:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.18 2021/03/02 07:37:27 rin Exp $");
 #endif
 
 #ifndef _POWERPC_INTR_MACHDEP_H_
@@ -103,8 +103,6 @@
 typedef uint32_t imask_t;
 #endif
 
-extern imask_t imask[];
-
 #define NVIRQ          (sizeof(imask_t)*8)     /* 32 virtual IRQs */
 #ifndef NIRQ
 #define NIRQ           256     /* up to 256 HW IRQs */
diff -r cf117f341d3a -r 8e15cce0ccba sys/arch/powerpc/pic/intr.c
--- a/sys/arch/powerpc/pic/intr.c       Tue Mar 02 07:27:24 2021 +0000
+++ b/sys/arch/powerpc/pic/intr.c       Tue Mar 02 07:37:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.29 2020/07/06 10:31:23 rin Exp $ */
+/*     $NetBSD: intr.c,v 1.30 2021/03/02 07:37:27 rin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -29,7 +29,7 @@
 #define __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.29 2020/07/06 10:31:23 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.30 2021/03/02 07:37:27 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_interrupt.h"
@@ -75,7 +75,7 @@
 int max_base = 0;
 uint8_t        virq_map[NIRQ];
 imask_t virq_mask = HWIRQ_MASK;
-imask_t        imask[NIPL];
+static imask_t imask[NIPL];
 int    primary_pic = 0;
 
 static int     fakeintr(void *);



Home | Main Index | Thread Index | Old Index