Module Name: src
Committed By: matt
Date: Sun Dec 22 16:29:42 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpu_in_cksum.S
Log Message:
Use arm_cksumdata instead of .L_cksumdata
pop {..., pc} instead of pop {..., lr}; RET
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/cpu_in_cksum.S
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/arm/cpu_in_cksum.S
diff -u src/sys/arch/arm/arm/cpu_in_cksum.S:1.7 src/sys/arch/arm/arm/cpu_in_cksum.S:1.8
--- src/sys/arch/arm/arm/cpu_in_cksum.S:1.7 Thu Dec 19 23:48:44 2013
+++ src/sys/arch/arm/arm/cpu_in_cksum.S Sun Dec 22 16:29:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_in_cksum.S,v 1.7 2013/12/19 23:48:44 joerg Exp $ */
+/* $NetBSD: cpu_in_cksum.S,v 1.8 2013/12/22 16:29:42 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum.S,v 1.7 2013/12/19 23:48:44 joerg Exp $")
+RCSID("$NetBSD: cpu_in_cksum.S,v 1.8 2013/12/22 16:29:42 matt Exp $")
#include "assym.h"
@@ -104,7 +104,7 @@ ENTRY(cpu_in_cksum)
#ifdef __thumb__
it ne
#endif
- blne _ASM_LABEL(.L_cksumdata)
+ blne _ASM_LABEL(arm_cksumdata)
tst r11, #0x01
#ifdef __thumb__
it ne
@@ -129,15 +129,14 @@ ENTRY(cpu_in_cksum)
mvn r0, r8
lsr r0, r0, #16
#endif
- pop {r4-r11, lr}
- RET
+ pop {r4-r11, pc}
.Lin_cksum_whoops:
adr r0, .Lin_cksum_whoops_str
bl _C_LABEL(panic)
.Lin_cksum_whoops_str:
.asciz "in_cksum: out of mbufs\n"
- .align 5
+ .p2align 5
END(cpu_in_cksum)
@@ -156,7 +155,7 @@ END(cpu_in_cksum)
* r0-r7
*/
/* LINTSTUB: Ignore */
-ASENTRY_NP(.L_cksumdata)
+ASENTRY_NP(arm_cksumdata)
#ifdef __PROG26
str lr, [sp, #-4]! /* for SVC26 mode */
#endif
@@ -410,4 +409,4 @@ ASENTRY_NP(.L_cksumdata)
#else
RET
#endif
-ASEND(.L_cksumdata)
+ASEND(arm_cksumdata)
