Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/include Restrict arm_cond_ok_p to when !__ASSEM...
details: https://anonhg.NetBSD.org/src/rev/7d967767571d
branches: trunk
changeset: 327423:7d967767571d
user: matt <matt%NetBSD.org@localhost>
date: Fri Mar 07 05:30:08 2014 +0000
description:
Restrict arm_cond_ok_p to when !__ASSEMBLER && _KERNEL is true.
diffstat:
sys/arch/arm/include/armreg.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r f995f45ab87a -r 7d967767571d sys/arch/arm/include/armreg.h
--- a/sys/arch/arm/include/armreg.h Fri Mar 07 05:27:33 2014 +0000
+++ b/sys/arch/arm/include/armreg.h Fri Mar 07 05:30:08 2014 +0000
@@ -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 @@
return (__cond & 1) ? !__ok : __ok;
}
-#endif
+#endif /* !__ASSEMBLER && _KERNEL */
#if !defined(__ASSEMBLER__) && !defined(_RUMPKERNEL)
#define ARMREG_READ_INLINE(name, __insnstring) \
Home |
Main Index |
Thread Index |
Old Index