From 5993683146a28b06c63443e4088ff93326f73457 Mon Sep 17 00:00:00 2001
From: Andrew Stubbs <ams@codesourcery.com>
Date: Mon, 29 Mar 2010 12:04:19 +0900
Subject: [PATCH] --- yaml --- r: 189379 b: refs/heads/master c:
 d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1 h: refs/heads/master i:   189377:
 3d8009232a64eb26d4729ab7c5029ea70b8880cf   189375:
 cff8ca6aa692ab707eca98e8f1b5b764aea30865 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sh/include/asm/elf.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd5133741833..d090d6507e54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59a2f7d9fd41c68b7013797e82b8f40fc154ccae
+refs/heads/master: d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1
diff --git a/trunk/arch/sh/include/asm/elf.h b/trunk/arch/sh/include/asm/elf.h
index ac04255022b6..ce830faeebbf 100644
--- a/trunk/arch/sh/include/asm/elf.h
+++ b/trunk/arch/sh/include/asm/elf.h
@@ -211,7 +211,9 @@ extern void __kernel_vsyscall;
 
 #define VSYSCALL_AUX_ENT					\
 	if (vdso_enabled)					\
-		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);
+		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);	\
+	else							\
+		NEW_AUX_ENT(AT_IGNORE, 0);
 #else
 #define VSYSCALL_AUX_ENT
 #endif /* CONFIG_VSYSCALL */
@@ -219,7 +221,7 @@ extern void __kernel_vsyscall;
 #ifdef CONFIG_SH_FPU
 #define FPU_AUX_ENT	NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT)
 #else
-#define FPU_AUX_ENT
+#define FPU_AUX_ENT	NEW_AUX_ENT(AT_IGNORE, 0)
 #endif
 
 extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;