Module Name: src
Committed By: matt
Date: Fri Mar 7 05:30:08 UTC 2014
Modified Files:
src/sys/arch/arm/include: armreg.h
Log Message:
Restrict arm_cond_ok_p to when !__ASSEMBLER && _KERNEL is true.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/arm/include/armreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.92 src/sys/arch/arm/include/armreg.h:1.93
--- src/sys/arch/arm/include/armreg.h:1.92 Fri Mar 7 05:27:33 2014
+++ src/sys/arch/arm/include/armreg.h Fri Mar 7 05:30:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.92 2014/03/07 05:27:33 matt Exp $ */
+/* $NetBSD: armreg.h,v 1.93 2014/03/07 05:30:08 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -770,7 +770,7 @@
#define ARM_A5_TLBDATAOP_INDEX __BITS(5,0)
#define ARM_A7_TLBDATAOP_INDEX __BITS(6,0)
-#if !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLER__) && defined(_KERNEL)
static inline bool
arm_cond_ok_p(uint32_t insn, uint32_t psr)
{
@@ -809,7 +809,7 @@ arm_cond_ok_p(uint32_t insn, uint32_t ps
return (__cond & 1) ? !__ok : __ok;
}
-#endif
+#endif /* !__ASSEMBLER && _KERNEL */
#if !defined(__ASSEMBLER__) && !defined(_RUMPKERNEL)
#define ARMREG_READ_INLINE(name, __insnstring) \
