diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-11-20 20:15:29 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-11-20 20:15:29 +0000 |
| commit | bce210113216c71bd29c3b39bd881db6489b9d46 (patch) | |
| tree | d5a330cdcbd204af58459dd3fc5cce0c03f1e19f /sys/arch/arm/include | |
| parent | 314a490e59e1938d0e0c5a4b187f56fe0fd9a533 (diff) | |
Do not attempt to include <machine/psl.h> when including this file from
assembly code (_KERNEL && _LOCORE)
Diffstat (limited to 'sys/arch/arm/include')
| -rw-r--r-- | sys/arch/arm/include/param.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h index 18978a312d5..c093e21ab35 100644 --- a/sys/arch/arm/include/param.h +++ b/sys/arch/arm/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.13 2010/05/24 02:00:35 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.14 2010/11/20 20:15:28 miod Exp $ */ /* $NetBSD: param.h,v 1.9 2002/03/24 03:37:23 thorpej Exp $ */ /* @@ -155,7 +155,6 @@ void delay (unsigned); /* pages ("clicks") to disk blocks */ #define ctod(x) ((x) << (PAGE_SHIFT - DEV_BSHIFT)) #define dtoc(x) ((x) >> (PAGE_SHIFT - DEV_BSHIFT)) -/*#define dtob(x) ((x) << DEV_BSHIFT)*/ #define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ ((bytes) >> DEV_BSHIFT) @@ -169,13 +168,9 @@ void delay (unsigned); #define ovbcopy bcopy -#ifdef _KERNEL -#ifdef _LOCORE -#include <machine/psl.h> -#else +#if defined(_KERNEL) && !defined(_LOCORE) #include <sys/param.h> #include <machine/cpu.h> #endif -#endif #endif /* _ARM_PARAM_H_ */ |