diff options
| author |   miod <miod@openbsd.org> | 2010-11-20 20:15:28 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2010-11-20 20:15:28 +0000 |
| commit | f83a4e1e83bf3cb09df178527e88d31dcccdc03d (patch) | |
| tree | 8476a84480d184fddca1a03941c0d16c0e9e91d2 | |
| parent | __attribute__((packed)) -> __packed. The ioprbs.c chunk was commented out, and (diff) | |
| download | wireguard-openbsd-f83a4e1e83bf3cb09df178527e88d31dcccdc03d.tar.xz wireguard-openbsd-f83a4e1e83bf3cb09df178527e88d31dcccdc03d.zip | |
Do not attempt to include <machine/psl.h> when including this file from
assembly code (_KERNEL && _LOCORE)
| -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_ */ |