summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/dev/creator.c4
-rw-r--r--sys/arch/sparc64/include/atomic.h8
-rw-r--r--sys/arch/sparc64/include/cpu.h6
-rw-r--r--sys/arch/sparc64/include/ctlreg.h36
-rw-r--r--sys/arch/sparc64/include/mutex.h4
-rw-r--r--sys/arch/sparc64/include/proc.h2
-rw-r--r--sys/arch/sparc64/include/psl.h12
-rw-r--r--sys/arch/sparc64/include/tcb.h4
-rw-r--r--sys/arch/sparc64/sparc64/autoconf.c4
-rw-r--r--sys/arch/sparc64/sparc64/clock.c6
-rw-r--r--sys/arch/sparc64/sparc64/cpu.c4
-rw-r--r--sys/arch/sparc64/sparc64/db_interface.c10
-rw-r--r--sys/arch/sparc64/sparc64/in4_cksum.c4
-rw-r--r--sys/arch/sparc64/sparc64/intr.c4
-rw-r--r--sys/arch/sparc64/sparc64/ipifuncs.c6
-rw-r--r--sys/arch/sparc64/sparc64/lock_machdep.c4
-rw-r--r--sys/arch/sparc64/sparc64/openfirm.c6
17 files changed, 62 insertions, 62 deletions
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c
index 5cb3a946cba..04effe065db 100644
--- a/sys/arch/sparc64/dev/creator.c
+++ b/sys/arch/sparc64/dev/creator.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: creator.c,v 1.46 2013/10/20 20:07:27 miod Exp $ */
+/* $OpenBSD: creator.c,v 1.47 2014/03/29 18:09:30 guenther Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -826,7 +826,7 @@ creator_load_sram(struct creator_softc *sc, u_int32_t *ucode, u_int32_t size)
while (size > 0) {
creator_ras_fifo_wait(sc, 16);
- __asm__ __volatile__("ld [%0 + 0x00], %%f1\n\t"
+ __asm__ volatile("ld [%0 + 0x00], %%f1\n\t"
"ld [%0 + 0x04], %%f0\n\t"
"ld [%0 + 0x08], %%f3\n\t"
"ld [%0 + 0x0c], %%f2\n\t"
diff --git a/sys/arch/sparc64/include/atomic.h b/sys/arch/sparc64/include/atomic.h
index 84f6e1c411c..29d05829631 100644
--- a/sys/arch/sparc64/include/atomic.h
+++ b/sys/arch/sparc64/include/atomic.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomic.h,v 1.10 2014/03/15 06:18:00 dlg Exp $ */
+/* $OpenBSD: atomic.h,v 1.11 2014/03/29 18:09:30 guenther Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
*
@@ -23,7 +23,7 @@
static inline unsigned int
_atomic_cas_uint(volatile unsigned int *p, unsigned int e, unsigned int n)
{
- __asm __volatile("cas [%2], %3, %0"
+ __asm volatile("cas [%2], %3, %0"
: "+r" (n), "=m" (*p)
: "r" (p), "r" (e), "m" (*p));
@@ -34,7 +34,7 @@ _atomic_cas_uint(volatile unsigned int *p, unsigned int e, unsigned int n)
static inline unsigned long
_atomic_cas_ulong(volatile unsigned long *p, unsigned long e, unsigned long n)
{
- __asm __volatile("casx [%2], %3, %0"
+ __asm volatile("casx [%2], %3, %0"
: "+r" (n), "=m" (*p)
: "r" (p), "r" (e), "m" (*p));
@@ -45,7 +45,7 @@ _atomic_cas_ulong(volatile unsigned long *p, unsigned long e, unsigned long n)
static inline void *
_atomic_cas_ptr(volatile void **p, void *e, void *n)
{
- __asm __volatile("casx [%2], %3, %0"
+ __asm volatile("casx [%2], %3, %0"
: "+r" (n), "=m" (*p)
: "r" (p), "r" (e), "m" (*p));
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index c99919f8902..c78ee0b71ae 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.83 2013/05/31 17:00:59 tedu Exp $ */
+/* $OpenBSD: cpu.h,v 1.84 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
/*
@@ -174,7 +174,7 @@ curcpu(void)
{
struct cpu_info *ci;
- __asm __volatile("mov %%g7, %0" : "=r"(ci));
+ __asm volatile("mov %%g7, %0" : "=r"(ci));
return (ci->ci_self);
}
@@ -264,7 +264,7 @@ void savefpstate(struct fpstate64 *);
void loadfpstate(struct fpstate64 *);
void clearfpstate(void);
u_int64_t probeget(paddr_t, int, int);
-#define write_all_windows() __asm __volatile("flushw" : : )
+#define write_all_windows() __asm volatile("flushw" : : )
void write_user_windows(void);
void proc_trampoline(void);
struct pcb;
diff --git a/sys/arch/sparc64/include/ctlreg.h b/sys/arch/sparc64/include/ctlreg.h
index c1cd7411f16..8918341d91f 100644
--- a/sys/arch/sparc64/include/ctlreg.h
+++ b/sys/arch/sparc64/include/ctlreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctlreg.h,v 1.25 2012/11/07 16:31:03 kettenis Exp $ */
+/* $OpenBSD: ctlreg.h,v 1.26 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: ctlreg.h,v 1.28 2001/08/06 23:55:34 eeh Exp $ */
/*
@@ -522,11 +522,11 @@
* D$ so we need to flush the D$ to make sure we don't get data pollution.
*/
-#define sparc_membar(mask) do { \
- if (mask) \
- __asm __volatile("membar %0" : : "n" (mask) : "memory");\
- else \
- __asm __volatile("" : : : "memory"); \
+#define sparc_membar(mask) do { \
+ if (mask) \
+ __asm volatile("membar %0" : : "n" (mask) : "memory"); \
+ else \
+ __asm volatile("" : : : "memory"); \
} while(0)
#define membar sparc_membar
@@ -541,22 +541,22 @@
#define sparc_wr(name, val, xor) \
do { \
if (__builtin_constant_p(xor)) \
- __asm __volatile("wr %%g0, %0, %%" #name \
+ __asm volatile("wr %%g0, %0, %%" #name \
: : "rI" ((val) ^ (xor)) : "%g0"); \
else \
- __asm __volatile("wr %0, %1, %%" #name \
+ __asm volatile("wr %0, %1, %%" #name \
: : "r" (val), "rI" (xor) : "%g0"); \
} while(0)
#define sparc_wrpr(name, val, xor) \
do { \
if (__builtin_constant_p(xor)) \
- __asm __volatile("wrpr %%g0, %0, %%" #name \
+ __asm volatile("wrpr %%g0, %0, %%" #name \
: : "rI" ((val) ^ (xor)) : "%g0"); \
else \
- __asm __volatile("wrpr %0, %1, %%" #name \
+ __asm volatile("wrpr %0, %1, %%" #name \
: : "r" (val), "rI" (xor) : "%g0"); \
- __asm __volatile("" : : : "memory"); \
+ __asm volatile("" : : : "memory"); \
} while(0)
@@ -567,7 +567,7 @@ extern __inline u_int64_t \
sparc_rd_ ## name() \
{ \
u_int64_t r; \
- __asm __volatile("rd %%" #name ", %0" : \
+ __asm volatile("rd %%" #name ", %0" : \
"=r" (r) : : "%g0"); \
return (r); \
}
@@ -579,7 +579,7 @@ extern __inline u_int64_t \
sparc_rdpr_ ## name() \
{ \
u_int64_t r; \
- __asm __volatile("rdpr %%" #name ", %0" : \
+ __asm volatile("rdpr %%" #name ", %0" : \
"=r" (r) : : "%g0"); \
return (r); \
}
@@ -612,7 +612,7 @@ GEN_RDPR(ver);
o ## _asi(paddr_t va) \
{ \
tp r; \
- __asm __volatile( \
+ __asm volatile( \
#o " [%1] %%asi, %0" \
: "=r" (r) \
: "r" ((volatile tp *)va) \
@@ -640,7 +640,7 @@ LDNC_GEN(int, lda);
(sizeof(type) == 1 && asi == ASI_PRIMARY_LITTLE)) \
__r ## op ## type = *((volatile type *)va); \
else \
- __asm __volatile(#opa " [%1] " #asi ", %0" \
+ __asm volatile(#opa " [%1] " #asi ", %0" \
: "=r" (__r ## op ## type) \
: "r" ((volatile type *)va) \
: "%g0"); \
@@ -664,7 +664,7 @@ LDNC_GEN(int, lda);
extern __inline void \
o ## _asi(paddr_t va, tp val) \
{ \
- __asm __volatile( \
+ __asm volatile( \
#o " %0, [%1] %%asi" \
: \
: "r" (val), "r" ((volatile tp *)va) \
@@ -690,7 +690,7 @@ STNC_GEN(u_int, sta);
(sizeof(type) == 1 && asi == ASI_PRIMARY_LITTLE)) \
*((volatile type *)va) = val; \
else \
- __asm __volatile(#opa " %0, [%1] " #asi \
+ __asm volatile(#opa " %0, [%1] " #asi \
: : "r" (val), "r" ((volatile type *)va) \
: "memory"); \
})
@@ -728,7 +728,7 @@ extern __inline void flush(void *);
extern __inline
void flush(void *p)
{
- __asm __volatile("flush %0"
+ __asm volatile("flush %0"
: : "r" (p)
: "memory");
}
diff --git a/sys/arch/sparc64/include/mutex.h b/sys/arch/sparc64/include/mutex.h
index 73a061419ad..0ac9deb5b5e 100644
--- a/sys/arch/sparc64/include/mutex.h
+++ b/sys/arch/sparc64/include/mutex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mutex.h,v 1.3 2013/07/14 21:22:08 kettenis Exp $ */
+/* $OpenBSD: mutex.h,v 1.4 2014/03/29 18:09:30 guenther Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -29,7 +29,7 @@
#define _MACHINE_MUTEX_H_
struct mutex {
- __volatile void *mtx_owner; /* mutex.S relies upon this being first */
+ volatile void *mtx_owner; /* mutex.S relies upon this being first */
int mtx_wantipl;
int mtx_oldipl;
};
diff --git a/sys/arch/sparc64/include/proc.h b/sys/arch/sparc64/include/proc.h
index 6ae7daa48d7..59ad6e5a1b6 100644
--- a/sys/arch/sparc64/include/proc.h
+++ b/sys/arch/sparc64/include/proc.h
@@ -46,7 +46,7 @@
struct mdproc {
struct trapframe64 *md_tf; /* trap/syscall registers */
struct fpstate64 *md_fpstate; /* fpu state, if any; always resident */
- __volatile int md_astpending;
+ volatile int md_astpending;
};
#define __HAVE_MD_TCB
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index bd7406f4e0b..d3fb5e8f6d4 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.27 2010/05/31 21:39:56 deraadt Exp $ */
+/* $OpenBSD: psl.h,v 1.28 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -356,12 +356,12 @@ extern __inline int name(void); \
extern __inline int name() \
{ \
int oldpil; \
- __asm __volatile(" rdpr %%pil, %0 \n" \
+ __asm volatile(" rdpr %%pil, %0 \n" \
" wrpr %%g0, %1, %%pil \n" \
: "=&r" (oldpil) \
: "n" (newpil) \
: "%g0"); \
- __asm __volatile("" : : : "memory"); \
+ __asm volatile("" : : : "memory"); \
return (oldpil); \
}
/* A non-priority-decreasing version of SPL */
@@ -372,7 +372,7 @@ extern __inline int name() \
int oldpil; \
\
if (newpil <= 1) { \
- __asm __volatile(" rdpr %%pil, %0 \n" \
+ __asm volatile(" rdpr %%pil, %0 \n" \
" brnz,pn %0, 1f \n" \
" nop \n" \
" wrpr %%g0, %1, %%pil \n" \
@@ -381,7 +381,7 @@ extern __inline int name() \
: "I" (newpil) \
: "%g0"); \
} else { \
- __asm __volatile(" rdpr %%pil, %0 \n" \
+ __asm volatile(" rdpr %%pil, %0 \n" \
" cmp %0, %1 - 1 \n" \
" bgu,pn %%xcc, 1f \n" \
" nop \n" \
@@ -391,7 +391,7 @@ extern __inline int name() \
: "I" (newpil) \
: "cc"); \
} \
- __asm __volatile("" : : : "memory"); \
+ __asm volatile("" : : : "memory"); \
return (oldpil); \
}
#endif
diff --git a/sys/arch/sparc64/include/tcb.h b/sys/arch/sparc64/include/tcb.h
index 112a807482e..be2085070b0 100644
--- a/sys/arch/sparc64/include/tcb.h
+++ b/sys/arch/sparc64/include/tcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcb.h,v 1.3 2011/11/08 22:46:07 kettenis Exp $ */
+/* $OpenBSD: tcb.h,v 1.4 2014/03/29 18:09:30 guenther Exp $ */
/*
* Copyright (c) 2011 Philip Guenther <guenther@openbsd.org>
@@ -68,7 +68,7 @@ __sparc64_read_tcb(int offset)
#define TCB_GET_MEMBER(member) \
__sparc64_read_tcb(offsetof(struct thread_control_block, member))
-#define TCB_SET(tcb) __asm __volatile("mov %0, %%g7" : : "r" (tcb))
+#define TCB_SET(tcb) __asm volatile("mov %0, %%g7" : : "r" (tcb))
#endif /* 0 */
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 5dd2b946cde..c8ba8639260 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.117 2012/08/29 20:33:16 kettenis Exp $ */
+/* $OpenBSD: autoconf.c,v 1.118 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
@@ -1267,7 +1267,7 @@ void
callrom()
{
- __asm __volatile("wrpr %%g0, 0, %%tl" : );
+ __asm volatile("wrpr %%g0, 0, %%tl" : );
OF_enter();
}
diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index 87c15e03b70..15c58e90c52 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.51 2014/02/08 11:04:50 kettenis Exp $ */
+/* $OpenBSD: clock.c,v 1.52 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
/*
@@ -1037,7 +1037,7 @@ tick_get_timecount(struct timecounter *tc)
{
u_int64_t tick;
- __asm __volatile("rd %%tick, %0" : "=r" (tick) :);
+ __asm volatile("rd %%tick, %0" : "=r" (tick) :);
return (tick & ~0u);
}
@@ -1047,7 +1047,7 @@ sys_tick_get_timecount(struct timecounter *tc)
{
u_int64_t tick;
- __asm __volatile("rd %%sys_tick, %0" : "=r" (tick) :);
+ __asm volatile("rd %%sys_tick, %0" : "=r" (tick) :);
return (tick & ~0u);
}
diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c
index 421d7173e90..976e74bfbe2 100644
--- a/sys/arch/sparc64/sparc64/cpu.c
+++ b/sys/arch/sparc64/sparc64/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.61 2014/01/19 12:45:36 deraadt Exp $ */
+/* $OpenBSD: cpu.c,v 1.62 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */
/*
@@ -794,7 +794,7 @@ cpu_idle_cycle(void)
* just as well as using the suspend instruction and makes the
* code a little bit less complicated.
*/
- __asm __volatile(
+ __asm volatile(
"999: nop \n"
" .section .sun4u_mtp_patch, \"ax\" \n"
" .word 999b \n"
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 96d351fe992..d8fba368c84 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.32 2012/03/23 15:51:26 guenther Exp $ */
+/* $OpenBSD: db_interface.c,v 1.33 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
/*
@@ -426,7 +426,7 @@ void db_print_dtlb_entry(int entry, int i, int endc);
extern __inline__ unsigned long db_get_dtlb_data(int entry)
{
unsigned long r;
- __asm__ __volatile__("ldxa [%1] %2,%0"
+ __asm__ volatile("ldxa [%1] %2,%0"
: "=r" (r)
: "r" (entry <<3), "i" (ASI_DMMU_TLB_DATA));
return r;
@@ -434,7 +434,7 @@ extern __inline__ unsigned long db_get_dtlb_data(int entry)
extern __inline__ unsigned long db_get_dtlb_tag(int entry)
{
unsigned long r;
- __asm__ __volatile__("ldxa [%1] %2,%0"
+ __asm__ volatile("ldxa [%1] %2,%0"
: "=r" (r)
: "r" (entry <<3), "i" (ASI_DMMU_TLB_TAG));
return r;
@@ -442,7 +442,7 @@ extern __inline__ unsigned long db_get_dtlb_tag(int entry)
extern __inline__ unsigned long db_get_itlb_data(int entry)
{
unsigned long r;
- __asm__ __volatile__("ldxa [%1] %2,%0"
+ __asm__ volatile("ldxa [%1] %2,%0"
: "=r" (r)
: "r" (entry <<3), "i" (ASI_IMMU_TLB_DATA));
return r;
@@ -450,7 +450,7 @@ extern __inline__ unsigned long db_get_itlb_data(int entry)
extern __inline__ unsigned long db_get_itlb_tag(int entry)
{
unsigned long r;
- __asm__ __volatile__("ldxa [%1] %2,%0"
+ __asm__ volatile("ldxa [%1] %2,%0"
: "=r" (r)
: "r" (entry <<3), "i" (ASI_IMMU_TLB_TAG));
return r;
diff --git a/sys/arch/sparc64/sparc64/in4_cksum.c b/sys/arch/sparc64/sparc64/in4_cksum.c
index abf6537bd83..e731c5f9d32 100644
--- a/sys/arch/sparc64/sparc64/in4_cksum.c
+++ b/sys/arch/sparc64/sparc64/in4_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in4_cksum.c,v 1.3 2008/05/15 22:17:08 brad Exp $ */
+/* $OpenBSD: in4_cksum.c,v 1.4 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: in4_cksum.c,v 1.5 2003/10/13 14:22:20 agc Exp $ */
/*
@@ -113,7 +113,7 @@ in4_cksum(struct mbuf *m, u_int8_t nxt, int off, int len)
ipov.ih_dst = mtod(m, struct ip *)->ip_dst;
w = (u_char *)&ipov;
/* assumes sizeof(ipov) == 20 */
- __asm __volatile(" lduw [%5 + 0], %1; "
+ __asm volatile(" lduw [%5 + 0], %1; "
" lduw [%5 + 4], %2; "
" lduw [%5 + 8], %3; add %0, %1, %0; "
" lduw [%5 + 12], %1; add %0, %2, %0; "
diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c
index 15e569106ca..92c78d31ffb 100644
--- a/sys/arch/sparc64/sparc64/intr.c
+++ b/sys/arch/sparc64/sparc64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.46 2014/01/21 10:19:31 dlg Exp $ */
+/* $OpenBSD: intr.c,v 1.47 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */
/*
@@ -359,7 +359,7 @@ splassert_check(int wantipl, const char *func)
struct cpu_info *ci = curcpu();
int oldipl;
- __asm __volatile("rdpr %%pil,%0" : "=r" (oldipl));
+ __asm volatile("rdpr %%pil,%0" : "=r" (oldipl));
if (oldipl < wantipl) {
splassert_fail(wantipl, oldipl, func);
diff --git a/sys/arch/sparc64/sparc64/ipifuncs.c b/sys/arch/sparc64/sparc64/ipifuncs.c
index d3ccc9acf19..9d3393414b2 100644
--- a/sys/arch/sparc64/sparc64/ipifuncs.c
+++ b/sys/arch/sparc64/sparc64/ipifuncs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipifuncs.c,v 1.13 2009/02/12 18:53:14 miod Exp $ */
+/* $OpenBSD: ipifuncs.c,v 1.14 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: ipifuncs.c,v 1.8 2006/10/07 18:11:36 rjs Exp $ */
/*-
@@ -86,7 +86,7 @@ sun4u_send_ipi(int itid, void (*func)(void), u_int64_t arg0, u_int64_t arg1)
shift = (itid & 0x3) * 2;
if (ldxa(0, ASR_IDSR) & (IDSR_BUSY << shift)) {
- __asm __volatile("ta 1; nop");
+ __asm volatile("ta 1; nop");
}
/* Schedule an interrupt. */
@@ -120,7 +120,7 @@ sun4u_send_ipi(int itid, void (*func)(void), u_int64_t arg0, u_int64_t arg1)
else
panic("ipi_send: couldn't send ipi");
#else
- __asm __volatile("ta 1; nop" : :);
+ __asm volatile("ta 1; nop" : :);
#endif
}
diff --git a/sys/arch/sparc64/sparc64/lock_machdep.c b/sys/arch/sparc64/sparc64/lock_machdep.c
index c653ae03faa..92d59254703 100644
--- a/sys/arch/sparc64/sparc64/lock_machdep.c
+++ b/sys/arch/sparc64/sparc64/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.6 2014/03/14 01:20:44 dlg Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.7 2014/03/29 18:09:30 guenther Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -59,7 +59,7 @@ extern int __mp_lock_spinout;
static __inline void
__mp_lock_spin_hook(void)
{
- __asm __volatile(
+ __asm volatile(
"999: rd %%ccr, %%g0 \n"
" rd %%ccr, %%g0 \n"
" rd %%ccr, %%g0 \n"
diff --git a/sys/arch/sparc64/sparc64/openfirm.c b/sys/arch/sparc64/sparc64/openfirm.c
index 1ae1392b110..e46bee8a949 100644
--- a/sys/arch/sparc64/sparc64/openfirm.c
+++ b/sys/arch/sparc64/sparc64/openfirm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openfirm.c,v 1.14 2010/04/10 14:02:49 kettenis Exp $ */
+/* $OpenBSD: openfirm.c,v 1.15 2014/03/29 18:09:30 guenther Exp $ */
/* $NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $ */
/*
@@ -770,7 +770,7 @@ void OF_sym2val(cells)
db_expr_t value;
/* Set data segment pointer */
- __asm __volatile("clr %%g4" : :);
+ __asm volatile("clr %%g4" : :);
/* No args? Nothing to do. */
if (!args->nargs ||
@@ -807,7 +807,7 @@ void OF_val2sym(cells)
db_expr_t offset;
/* Set data segment pointer */
- __asm __volatile("clr %%g4" : :);
+ __asm volatile("clr %%g4" : :);
if (obp_symbol_debug)
prom_printf("OF_val2sym: nargs %lx nreturns %lx\r\n",
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 07:20:50 +0000