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 Use __ASSEMBLER__ to control inline def...



details:   https://anonhg.NetBSD.org/src/rev/b9e7e7f48d30
branches:  trunk
changeset: 781301:b9e7e7f48d30
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Aug 31 12:01:15 2012 +0000

description:
Use __ASSEMBLER__ to control inline definitions

diffstat:

 sys/arch/arm/include/armreg.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 09ba37691f11 -r b9e7e7f48d30 sys/arch/arm/include/armreg.h
--- a/sys/arch/arm/include/armreg.h     Fri Aug 31 11:52:39 2012 +0000
+++ b/sys/arch/arm/include/armreg.h     Fri Aug 31 12:01:15 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armreg.h,v 1.61 2012/08/31 11:40:42 matt Exp $ */
+/*     $NetBSD: armreg.h,v 1.62 2012/08/31 12:01:15 matt Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -530,7 +530,7 @@
 #define CORTEX_CNTENC_C __BIT(31)      /* Disables the cycle counter */
 #define CORTEX_CNTOFL_C __BIT(31)      /* Cycle counter overflow flag */
 
-#if !defined(_LOCORE) && !defined(_STANDALONE)
+#if !defined(__ASSEMBLER__)
 #define        ARMREG_READ_INLINE(name, __insnstring)                  \
 static inline uint32_t armreg_##name##_read(void)              \
 {                                                              \
@@ -589,7 +589,7 @@
 ARMREG_READ_INLINE(pmccntrv6, "p15,0,%0,c15,c12,1") /* PMC Cycle Counter (armv6) */
 ARMREG_WRITE_INLINE(pmccntrv6, "p15,0,%0,c15,c12,1") /* PMC Cycle Counter (armv6) */
 
-#endif /* !_LOCORE && !_STANDALONE */
+#endif /* !__ASSEMBLER__ */
 
 
 #define        MPIDR_31                0x80000000



Home | Main Index | Thread Index | Old Index