Fri Feb 13 08:37:52 2009 UTC ()
Allow kern_ssp.c to build.  That file includes <sys/intr.h> without
first including <sys/cpu.h>, so include <arm/cpu.h> here so that
curcpl() and set_curcpl() are declared before they are used.


(he)
diff -r1.13 -r1.14 src/sys/arch/arm/footbridge/footbridge_intr.h
cvs diff -r1.13 -r1.14 src/sys/arch/arm/footbridge/footbridge_intr.h (expand / switch to unified diff)

--- src/sys/arch/arm/footbridge/footbridge_intr.h 2008/04/27 18:58:44 1.13
+++ src/sys/arch/arm/footbridge/footbridge_intr.h 2009/02/13 08:37:52 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: footbridge_intr.h,v 1.13 2008/04/27 18:58:44 matt Exp $ */ 1/* $NetBSD: footbridge_intr.h,v 1.14 2009/02/13 08:37:52 he Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001, 2002 Wasabi Systems, Inc. 4 * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc. 7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -28,26 +28,27 @@ @@ -28,26 +28,27 @@
28 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC 28 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
29 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 29 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE. 35 * POSSIBILITY OF SUCH DAMAGE.
36 */ 36 */
37 37
38#ifndef _FOOTBRIDGE_INTR_H_ 38#ifndef _FOOTBRIDGE_INTR_H_
39#define _FOOTBRIDGE_INTR_H_ 39#define _FOOTBRIDGE_INTR_H_
40 40
 41#include <arm/cpu.h>
41#include <arm/armreg.h> 42#include <arm/armreg.h>
42 43
43#define IPL_NONE 0 /* nothing */ 44#define IPL_NONE 0 /* nothing */
44#define IPL_SOFTCLOCK 1 /* clock soft interrupts */ 45#define IPL_SOFTCLOCK 1 /* clock soft interrupts */
45#define IPL_SOFTBIO 2 /* block i/o */ 46#define IPL_SOFTBIO 2 /* block i/o */
46#define IPL_SOFTNET 3 /* network software interrupts */ 47#define IPL_SOFTNET 3 /* network software interrupts */
47#define IPL_SOFTSERIAL 4 /* serial software interrupts */ 48#define IPL_SOFTSERIAL 4 /* serial software interrupts */
48#define IPL_VM 5 /* memory allocation */ 49#define IPL_VM 5 /* memory allocation */
49#define IPL_SCHED 6 /* clock */ 50#define IPL_SCHED 6 /* clock */
50#define IPL_HIGH 7 /* everything */ 51#define IPL_HIGH 7 /* everything */
51 52
52#define NIPL 8 53#define NIPL 8
53 54