Mon Mar 30 05:43:55 2015 UTC ()
#include <sys/pcu.h>


(matt)
diff -r1.20 -r1.21 src/sys/arch/arm/include/locore.h
cvs diff -r1.20 -r1.21 src/sys/arch/arm/include/locore.h (expand / switch to unified diff)

--- src/sys/arch/arm/include/locore.h 2015/03/29 09:49:54 1.20
+++ src/sys/arch/arm/include/locore.h 2015/03/30 05:43:55 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.h,v 1.20 2015/03/29 09:49:54 matt Exp $ */ 1/* $NetBSD: locore.h,v 1.21 2015/03/30 05:43:55 matt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1994-1996 Mark Brinicombe. 4 * Copyright (c) 1994-1996 Mark Brinicombe.
5 * Copyright (c) 1994 Brini. 5 * Copyright (c) 1994 Brini.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software written for Brini by Mark Brinicombe 8 * This code is derived from software written for Brini by Mark Brinicombe
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -44,26 +44,28 @@ @@ -44,26 +44,28 @@
44 * 44 *
45 * Based on kate/katelib/arm6.h 45 * Based on kate/katelib/arm6.h
46 */ 46 */
47 47
48#ifndef _ARM_LOCORE_H_ 48#ifndef _ARM_LOCORE_H_
49#define _ARM_LOCORE_H_ 49#define _ARM_LOCORE_H_
50 50
51#ifdef _KERNEL_OPT 51#ifdef _KERNEL_OPT
52#include "opt_cpuoptions.h" 52#include "opt_cpuoptions.h"
53#include "opt_cputypes.h" 53#include "opt_cputypes.h"
54#include "opt_arm_debug.h" 54#include "opt_arm_debug.h"
55#endif 55#endif
56 56
 57#include <sys/pcu.h>
 58
57#include <arm/cpuconf.h> 59#include <arm/cpuconf.h>
58#include <arm/armreg.h> 60#include <arm/armreg.h>
59 61
60#include <machine/frame.h> 62#include <machine/frame.h>
61 63
62#ifdef _LOCORE 64#ifdef _LOCORE
63 65
64#if defined(_ARM_ARCH_6) 66#if defined(_ARM_ARCH_6)
65#define IRQdisable cpsid i 67#define IRQdisable cpsid i
66#define IRQenable cpsie i 68#define IRQenable cpsie i
67#elif defined(__PROG32) 69#elif defined(__PROG32)
68#define IRQdisable \ 70#define IRQdisable \
69 stmfd sp!, {r0} ; \ 71 stmfd sp!, {r0} ; \