Module Name: src
Committed By: matt
Date: Mon Aug 19 22:26:10 UTC 2013
Modified Files:
src/sys/arch/evbarm/nslu2: nslu2_leds.c nslu2_machdep.c
Log Message:
Fix <arm/locore.h> lossage
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/nslu2/nslu2_leds.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/nslu2/nslu2_machdep.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/evbarm/nslu2/nslu2_leds.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_leds.c:1.9 src/sys/arch/evbarm/nslu2/nslu2_leds.c:1.10
--- src/sys/arch/evbarm/nslu2/nslu2_leds.c:1.9 Sun Oct 14 14:20:58 2012
+++ src/sys/arch/evbarm/nslu2/nslu2_leds.c Mon Aug 19 22:26:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_leds.c,v 1.9 2012/10/14 14:20:58 msaitoh Exp $ */
+/* $NetBSD: nslu2_leds.c,v 1.10 2013/08/19 22:26:09 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_leds.c,v 1.9 2012/10/14 14:20:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_leds.c,v 1.10 2013/08/19 22:26:09 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_leds.c
#include <sys/device.h>
#include <sys/callout.h>
#include <sys/proc.h>
-
-#include <machine/intr.h>
+#include <sys/intr.h>
+#include <sys/cpu.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbcdc.h>
@@ -144,11 +144,11 @@ slugled_intr2(void *arg)
static int
slugled_tmr(void *arg)
{
- struct clockframe *frame = arg;
+ struct clockframe *cf = arg;
uint32_t reg, bit;
int is;
- if (CLKF_INTR(frame) || sched_curcpu_runnable_p() ||
+ if (CLKF_INTR(cf) || sched_curcpu_runnable_p() ||
(curlwp != NULL && curlwp != curcpu()->ci_data.cpu_idlelwp))
bit = LEDBITS_STATUS;
else
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.23 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.24
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.23 Mon Nov 12 18:00:39 2012
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Mon Aug 19 22:26:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.23 2012/11/12 18:00:39 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.24 2013/08/19 22:26:09 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.23 2012/11/12 18:00:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.24 2013/08/19 22:26:09 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -110,6 +110,8 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_machde
#include <sys/reboot.h>
#include <sys/termios.h>
#include <sys/ksyms.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
@@ -120,9 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_machde
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <sys/bus.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
+#include <arm/locore.h>
#include <arm/undefined.h>
#include <arm/arm32/machdep.h>
