From 3625809e03b7287e244a6a2563d5217426e88d5c Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Sat, 15 Jun 2013 17:37:04 +0000
Subject: Merge changes between r23217 and r23296 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@23297 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/ports/sysdeps/unix/sysv/linux/arm/mmap.S              | 2 +-
 libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | 2 +-
 libc/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libc/ports/sysdeps/unix/sysv/linux/arm')

diff --git a/libc/ports/sysdeps/unix/sysv/linux/arm/mmap.S b/libc/ports/sysdeps/unix/sysv/linux/arm/mmap.S
index 06b737eeb..9fb1931c1 100644
--- a/libc/ports/sysdeps/unix/sysv/linux/arm/mmap.S
+++ b/libc/ports/sysdeps/unix/sysv/linux/arm/mmap.S
@@ -37,7 +37,7 @@ ENTRY (__mmap)
 	movs	ip, r5, lsl #20
 	bne	.Linval
 	mov	r5, r5, lsr #12
-	
+
 	/* do the syscall */
 	DO_CALL (mmap2, 0)
 
diff --git a/libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h b/libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
index fe21cdaf2..a29593aec 100644
--- a/libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+++ b/libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
@@ -71,7 +71,7 @@
       : (fl))								      \
    : ((fl) | (((private) ^ FUTEX_PRIVATE_FLAG)				      \
 	      & THREAD_GETMEM (THREAD_SELF, header.private_futex))))
-# endif	      
+# endif
 #endif
 
 
diff --git a/libc/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S b/libc/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S
index db8562399..8a968eb0a 100644
--- a/libc/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S
+++ b/libc/ports/sysdeps/unix/sysv/linux/arm/swapcontext.S
@@ -50,7 +50,7 @@ ENTRY(swapcontext)
 	itt	ne
 	movne	r0, r4
 	RETINSTR(ne, r14)
-	
+
 	/* Fix up LR and the PC.  */
 	str	r13,[r0, #MCONTEXT_ARM_SP]
 	str	r14,[r0, #MCONTEXT_ARM_LR]
-- 
cgit v1.2.3