[src/trunk]: src/sys/arch/arm26/include Use <arm/cpu.h>.

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e8f7b9c6d920
branches:  trunk
changeset: 504354:e8f7b9c6d920
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Wed Feb 28 00:17:40 2001 +0000

description:
Use <arm/cpu.h>.

diffstat:

 sys/arch/arm26/include/cpu.h |  85 +------------------------------------------
 1 files changed, 2 insertions(+), 83 deletions(-)

diffs (90 lines):

diff -r 33611affd82a -r e8f7b9c6d920 sys/arch/arm26/include/cpu.h
--- a/sys/arch/arm26/include/cpu.h      Wed Feb 28 00:17:18 2001 +0000
+++ b/sys/arch/arm26/include/cpu.h      Wed Feb 28 00:17:40 2001 +0000
@@ -1,84 +1,3 @@
-/* $NetBSD: cpu.h,v 1.3 2000/08/25 16:43:47 bjh21 Exp $ */
-/*-
- * Copyright (c) 1998 Ben Harris
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
-
-#ifndef _ARM26_CPU_H
-#define _ARM26_CPU_H
-
-#include <machine/frame.h>
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_lockdebug.h"
-#endif
+/* $NetBSD: cpu.h,v 1.4 2001/02/28 00:17:40 bjh21 Exp $ */
 
-#include <sys/sched.h>
-struct cpu_info {
-       struct schedstate_percpu ci_schedstate; /* scheduler state */
-#if defined(DIAGNOSTIC) || defined(LOCKDEBUG)
-       u_long ci_spin_locks;           /* # of spin locks held */
-       u_long ci_simple_locks;         /* # of simple locks held */
-#endif
-};
-
-#ifdef _KERNEL
-extern struct cpu_info cpu_info_store;
-
-#define        curcpu()        (&cpu_info_store)
-#define cpu_number()   (0)
-#endif
-
-#define INSN_SIZE 4
-
-#ifdef _KERNEL
-/* ASTs etc */
-
-#include <sys/proc.h>
-extern int want_resched, astpending;
-
-#define setsoftast()                                                   \
-do {                                                                   \
-       astpending = 1;                                                 \
-} while (/* CONSTCOND */ 0)
-
-#define need_resched(ci)                                               \
-do {                                                                   \
-       want_resched = 1;                                               \
-       setsoftast();                                                   \
-} while (/* CONSTCOND */ 0)
-
-#define need_proftick(p)                                               \
-do {                                                                   \
-       (p)->p_flag |= P_OWEUPC;                                        \
-       setsoftast();                                                   \
-} while (/* CONSTCOND */ 0)
-
-#define signotify(p) setsoftast()
-
-#endif /* _KERNEL */
-
-#endif
+#include <arm/cpu.h>