Module Name: src Committed By: christos Date: Fri Jan 2 02:00:15 UTC 2015
Modified Files: src/sys/arch/arm/include: lock.h Log Message: add constcond. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/include/lock.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/lock.h diff -u src/sys/arch/arm/include/lock.h:1.28 src/sys/arch/arm/include/lock.h:1.29 --- src/sys/arch/arm/include/lock.h:1.28 Sun Aug 10 02:23:13 2014 +++ src/sys/arch/arm/include/lock.h Thu Jan 1 21:00:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.28 2014/08/10 06:23:13 matt Exp $ */ +/* $NetBSD: lock.h,v 1.29 2015/01/02 02:00:15 christos Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ static __inline unsigned int __arm_load_exclusive(__cpu_simple_lock_t *__alp) { unsigned int __rv; - if (sizeof(*__alp) == 1) { + if (/*CONSTCOND*/sizeof(*__alp) == 1) { __asm __volatile("ldrexb\t%0,[%1]" : "=r"(__rv) : "r"(__alp)); } else { __asm __volatile("ldrex\t%0,[%1]" : "=r"(__rv) : "r"(__alp)); @@ -91,7 +91,7 @@ static __inline unsigned int __arm_store_exclusive(__cpu_simple_lock_t *__alp, unsigned int __val) { unsigned int __rv; - if (sizeof(*__alp) == 1) { + if (/*CONSTCOND*/sizeof(*__alp) == 1) { __asm __volatile("strexb\t%0,%1,[%2]" : "=&r"(__rv) : "r"(__val), "r"(__alp) : "cc", "memory"); } else {