Sun Sep 23 06:05:32 2012 UTC ()
correct some comments on #endif to match their #if.


(mrg)
diff -r1.8 -r1.9 src/sys/arch/powerpc/powerpc/lock_stubs.S

cvs diff -r1.8 -r1.9 src/sys/arch/powerpc/powerpc/lock_stubs.S (expand / switch to unified diff)

--- src/sys/arch/powerpc/powerpc/lock_stubs.S 2011/06/05 16:52:26 1.8
+++ src/sys/arch/powerpc/powerpc/lock_stubs.S 2012/09/23 06:05:32 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: lock_stubs.S,v 1.8 2011/06/05 16:52:26 matt Exp $ */ 1/* $NetBSD: lock_stubs.S,v 1.9 2012/09/23 06:05:32 mrg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 The NetBSD Foundation, Inc. 4 * Copyright (c) 2007 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -86,27 +86,27 @@ ENTRY(mutex_enter) @@ -86,27 +86,27 @@ ENTRY(mutex_enter)
86ENTRY(mutex_exit) 86ENTRY(mutex_exit)
87 SYNC 87 SYNC
88 li %r7,0 88 li %r7,0
891: 891:
90 lptrarx %r10,0,%r3 90 lptrarx %r10,0,%r3
91 cmpw %r10,%r13 91 cmpw %r10,%r13
92 bne- 2f 92 bne- 2f
93 stptrcx. %r7,0,%r3 93 stptrcx. %r7,0,%r3
94 bne- 1b 94 bne- 1b
95 blr 95 blr
962: 962:
97 b _C_LABEL(mutex_vector_exit) 97 b _C_LABEL(mutex_vector_exit)
98 98
99#endif /* __HAVE_MUTEX_STUBS */ 99#endif /* !LOCKDEBUG */
100 100
101/* 101/*
102 * void rw_enter(krwlock_t *krw, krw_t op); 102 * void rw_enter(krwlock_t *krw, krw_t op);
103 */ 103 */
104#if RW_READ_INCR != 16 104#if RW_READ_INCR != 16
105#error RW_READ_INCR != 16, clrrXi need fixing 105#error RW_READ_INCR != 16, clrrXi need fixing
106#endif 106#endif
107#if RW_OWNER != 0 107#if RW_OWNER != 0
108#error RW_OWNER != 0, ldptr should be ldptru 108#error RW_OWNER != 0, ldptr should be ldptru
109#endif 109#endif
110 110
111#if __HAVE_RW_STUBS 111#if __HAVE_RW_STUBS
112 112
@@ -180,14 +180,14 @@ ENTRY(rw_exit) @@ -180,14 +180,14 @@ ENTRY(rw_exit)
180 180
1812: lptrarx %r10,0,%r3 1812: lptrarx %r10,0,%r3
182 cmpw %r10,%r9 182 cmpw %r10,%r9
183 bne- 3f 183 bne- 3f
184 stptrcx. %r7,0,%r3 184 stptrcx. %r7,0,%r3
185 bne- 2b 185 bne- 2b
186 186
187 blr 187 blr
188 188
1893: b _C_LABEL(rw_vector_exit) 1893: b _C_LABEL(rw_vector_exit)
190 190
191#endif /* __HAVE_RW_STUBS */ 191#endif /* __HAVE_RW_STUBS */
192 192
193#endif /* !LOCKDEBUG */ 193#endif /* __HAVE_MUTEX_STUBS */