Module Name: src
Committed By: matt
Date: Sun Apr 13 02:21:47 UTC 2014
Modified Files:
src/sys/arch/arm/cortex: gic.c
Log Message:
Move aprint to print sooner.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/sys/arch/arm/cortex/gic.c:1.8
--- src/sys/arch/arm/cortex/gic.c:1.7 Fri Mar 28 21:39:09 2014
+++ src/sys/arch/arm/cortex/gic.c Sun Apr 13 02:21:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.7 2014/03/28 21:39:09 matt Exp $ */
+/* $NetBSD: gic.c,v 1.8 2014/04/13 02:21:47 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.7 2014/03/28 21:39:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.8 2014/04/13 02:21:47 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -563,6 +563,10 @@ armgic_attach(device_t parent, device_t
sc->sc_gic_valid_lines[group] = valid;
}
+ aprint_normal(": Generic Interrupt Controller, "
+ "%zu sources (%zu valid)\n",
+ sc->sc_pic.pic_maxsources, sc->sc_gic_lines);
+
pic_add(&sc->sc_pic, 0);
/*
@@ -620,10 +624,6 @@ armgic_attach(device_t parent, device_t
armgic_cpu_init(&sc->sc_pic, curcpu());
#endif
- aprint_normal(": Generic Interrupt Controller, "
- "%zu sources (%zu valid)\n",
- sc->sc_pic.pic_maxsources, sc->sc_gic_lines);
-
const u_int ppis = popcount32(sc->sc_gic_valid_lines[0] >> 16);
const u_int sgis = popcount32(sc->sc_gic_valid_lines[0] & 0xffff);
aprint_normal_dev(sc->sc_dev, "%u Priorities, %zu SPIs, %u PPIs, %u SGIs\n",
