From 012d35f7610b12b33d6c10a5159c55376f515993 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 3 Mar 2011 13:25:36 -0800
Subject: [PATCH] Fix sparc64 bzero on non-Niagara systems.

---
 ChangeLog                                | 5 +++++
 sysdeps/sparc/sparc64/multiarch/memset.S | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a60bf2b103..1e3ba02225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/sparc/sparc64/multiarch/memset.S(__bzero): call
+	__bzero_ultra1 instead of __memset_ultra1.
+
 2011-02-23  Andreas Schwab  <schwab@redhat.com>
 	    Ulrich Drepper  <drepper@gmail.com>
 
diff --git a/sysdeps/sparc/sparc64/multiarch/memset.S b/sysdeps/sparc/sparc64/multiarch/memset.S
index 23e513f18f..befd7edc82 100644
--- a/sysdeps/sparc/sparc64/multiarch/memset.S
+++ b/sysdeps/sparc/sparc64/multiarch/memset.S
@@ -114,8 +114,8 @@ ENTRY(__bzero)
 	 nop
 9:
 # ifdef SHARED
-	sethi	%gdop_hix22(__memset_ultra1), %o1
-	xor	%o1, %gdop_lox10(__memset_ultra1), %o1
+	sethi	%gdop_hix22(__bzero_ultra1), %o1
+	xor	%o1, %gdop_lox10(__bzero_ultra1), %o1
 # else
 	set	__bzero_ultra1, %o1
 # endif