From 3749a8a8f455a4c671b23b16e6a8fd1938abd7a3 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 26 May 2008 13:36:53 -0700
Subject: [PATCH] --- yaml --- r: 99388 b: refs/heads/master c:
 1a20d3ecf5c2a6435df2b756435b1eb1c657d45b h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/string_32.h | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0a34a5c352bf..fbe629205913 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6011bc6ec71660859139ac8d28b7d0badd681c
+refs/heads/master: 1a20d3ecf5c2a6435df2b756435b1eb1c657d45b
diff --git a/trunk/include/asm-x86/string_32.h b/trunk/include/asm-x86/string_32.h
index 8d0c593c4413..193578cd1fd9 100644
--- a/trunk/include/asm-x86/string_32.h
+++ b/trunk/include/asm-x86/string_32.h
@@ -267,11 +267,18 @@ void *__constant_c_and_count_memset(void *s, unsigned long pattern,
 	asm volatile("rep ; stosl"					\
 		     x							\
 		     : "=&c" (d0), "=&D" (d1)				\
-		     : "a" (pattern), "0" (count/4), "1" ((long)s)	\
+		     : "a" (eax), "0" (count/4), "1" ((long)s)	\
 		     : "memory")
 
 	{
 		int d0, d1;
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 0
+		/* Workaround for broken gcc 4.0 */
+		register unsigned long eax asm("%eax") = pattern;
+#else
+		unsigned long eax = pattern;
+#endif
+
 		switch (count % 4) {
 		case 0:
 			COMMON("");