Module Name: src
Committed By: rin
Date: Tue Mar 2 07:37:27 UTC 2021
Modified Files:
src/sys/arch/powerpc/include: intr.h
src/sys/arch/powerpc/pic: intr.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/intr.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/pic/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/intr.h
diff -u src/sys/arch/powerpc/include/intr.h:1.17 src/sys/arch/powerpc/include/intr.h:1.18
--- src/sys/arch/powerpc/include/intr.h:1.17 Thu Apr 16 23:29:52 2020
+++ src/sys/arch/powerpc/include/intr.h Tue Mar 2 07:37:27 2021
@@ -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 __IMASK_T imask_t;
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 */
Index: src/sys/arch/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.29 src/sys/arch/powerpc/pic/intr.c:1.30
--- src/sys/arch/powerpc/pic/intr.c:1.29 Mon Jul 6 10:31:23 2020
+++ src/sys/arch/powerpc/pic/intr.c Tue Mar 2 07:37:27 2021
@@ -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 num_pics = 0;
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 *);
