summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/include
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2008-07-05 15:28:30 +0000
committermarius <marius@FreeBSD.org>2008-07-05 15:28:30 +0000
commit55c10251475df943688a88af33745fab0edbe511 (patch)
tree743f33fc8367b51dfeb2e34b338ebb2a9a8720ce /sys/sparc64/include
parent0087e14c9d28c9e717db61a2ac5ddf85282ac346 (diff)
downloadFreeBSD-src-55c10251475df943688a88af33745fab0edbe511.zip
FreeBSD-src-55c10251475df943688a88af33745fab0edbe511.tar.gz
Revert the addition of "__volatile" to "__asm" done in r180011, since
the condition codes where added to the clobber lists in r180073 the former is unnecessary.
Diffstat (limited to 'sys/sparc64/include')
-rw-r--r--sys/sparc64/include/in_cksum.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/sparc64/include/in_cksum.h b/sys/sparc64/include/in_cksum.h
index c7cc5a1..c754d8b 100644
--- a/sys/sparc64/include/in_cksum.h
+++ b/sys/sparc64/include/in_cksum.h
@@ -79,7 +79,7 @@ in_addword(u_short sum, u_short b)
{
u_long __ret, __tmp;
- __asm __volatile(
+ __asm(
"sll %2, 16, %0\n"
"sll %3, 16, %1\n"
"addcc %0, %1, %0\n"
@@ -94,7 +94,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
{
u_long __tmp;
- __asm __volatile(
+ __asm(
"addcc %0, %3, %0\n"
"addccc %0, %4, %0\n"
"addc %0, 0, %0\n"
@@ -112,7 +112,7 @@ in_cksum_hdr(struct ip *ip)
u_long __ret, __tmp1, __tmp2, __tmp3, __tmp4;
/*
- * Use 32 bit memory accesses and additions - addition with carry only
+ * Use 32-bit memory accesses and additions - addition with carry only
* works for 32 bits, and fixing up alignment issues for 64 is probably
* more trouble than it's worth.
* This may read outside of the ip header, but does not cross a page
@@ -125,7 +125,7 @@ in_cksum_hdr(struct ip *ip)
"lduw [" #addr " + " #offs "], " #tmp "\n" \
"add" # mod " " #sum ", " #tmp ", " #sum "\n"
- __asm __volatile(
+ __asm(
"and %5, 3, %3\n"
"andn %5, 3, %1\n"
"brz,pt %3, 0f\n"
OpenPOWER on IntegriCloud