Module Name: src
Committed By: jmcneill
Date: Sun Feb 7 21:18:37 UTC 2021
Modified Files:
src/sys/arch/arm/pic: pic.c
Log Message:
Use ENABLE_INTERRUPT() / DISABLE_INTERRUPT() instead of cpsie()/cpsid() in
places where we don't care about the cpsie() return value.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/pic/pic.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/arm/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.61 src/sys/arch/arm/pic/pic.c:1.62
--- src/sys/arch/arm/pic/pic.c:1.61 Sun Nov 1 14:42:05 2020
+++ src/sys/arch/arm/pic/pic.c Sun Feb 7 21:18:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.61 2020/11/01 14:42:05 jmcneill Exp $ */
+/* $NetBSD: pic.c,v 1.62 2021/02/07 21:18:37 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.61 2020/11/01 14:42:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.62 2021/02/07 21:18:37 jmcneill Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -447,13 +447,14 @@ pic_deliver_irqs(struct pic_pending *pen
atomic_and_32(ipending, ~__BIT(irq));
is = pic->pic_sources[irq_base + irq];
if (is != NULL) {
- cpsie(I32_bit);
+ ENABLE_INTERRUPT();
pic_dispatch(is, frame);
- cpsid(I32_bit);
+ DISABLE_INTERRUPT();
#if PIC_MAXSOURCES > 32
/*
* There is a possibility of interrupting
- * from cpsie() to cpsid().
+ * from ENABLE_INTERRUPT() to
+ * DISABLE_INTERRUPT().
*/
poi = 1;
#endif
