Module Name: src
Committed By: snj
Date: Sun Mar 15 22:46:38 UTC 2015
Modified Files:
src/sys/arch/arm/cortex [netbsd-7]: gic.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #591):
sys/arch/arm/cortex/gic.c: revision 1.15
G/C armgic_last_priority
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/sys/arch/arm/cortex/gic.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/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.10.2.2 src/sys/arch/arm/cortex/gic.c:1.10.2.3
--- src/sys/arch/arm/cortex/gic.c:1.10.2.2 Sat Mar 7 05:04:49 2015
+++ src/sys/arch/arm/cortex/gic.c Sun Mar 15 22:46:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.10.2.2 2015/03/07 05:04:49 snj Exp $ */
+/* $NetBSD: gic.c,v 1.10.2.3 2015/03/15 22:46:38 snj Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.10.2.2 2015/03/07 05:04:49 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.10.2.3 2015/03/15 22:46:38 snj Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -181,8 +181,6 @@ armgic_block_irqs(struct pic_softc *pic,
gicd_write(sc, GICD_ICENABLERn(group), irq_mask);
}
-static uint32_t armgic_last_priority;
-
static void
armgic_set_priority(struct pic_softc *pic, int ipl)
{
@@ -190,7 +188,6 @@ armgic_set_priority(struct pic_softc *pi
const uint32_t priority = armgic_ipl_to_priority(ipl);
gicc_write(sc, GICC_PMR, priority);
- armgic_last_priority = priority;
}
#ifdef __HAVE_PIC_FAST_SOFTINTS
