From 56bf0779e42bafad783a23b69c3ff0806dca8d1b Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jan 2008 13:30:42 +0100
Subject: [PATCH] --- yaml --- r: 79839 b: refs/heads/master c:
 4707c4717a5a6f375f3300bbccff1d46dcf75b25 h: refs/heads/master i:   79837:
 3613a95347e15ad6bae2a74fb57257a049249b9b   79835:
 0822bcc1a8b4b6712c4b55dc0ef929cd21ae7d57   79831:
 4d1d51dc4b13af9771d8c35e16299c8744fc106d   79823:
 113233cd9fd91d3236aa43d06fdd4849547dff8b   79807:
 369902b5af6a4988f84f708f3054c7adfa6b7083 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/boot/compressed/relocs.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cee0d9d67854..4b0d59baabdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c3652efcafa6a6d795093362cb4290c84994b5c
+refs/heads/master: 4707c4717a5a6f375f3300bbccff1d46dcf75b25
diff --git a/trunk/arch/x86/boot/compressed/relocs.c b/trunk/arch/x86/boot/compressed/relocs.c
index 7a0d00b2cf28..d01ea42187e6 100644
--- a/trunk/arch/x86/boot/compressed/relocs.c
+++ b/trunk/arch/x86/boot/compressed/relocs.c
@@ -27,11 +27,6 @@ static unsigned long *relocs;
  * absolute relocations present w.r.t these symbols.
  */
 static const char* safe_abs_relocs[] = {
-		"__kernel_vsyscall",
-		"__kernel_rt_sigreturn",
-		"__kernel_sigreturn",
-		"SYSENTER_RETURN",
-		"VDSO_NOTE_MASK",
 		"xen_irq_disable_direct_reloc",
 		"xen_save_fl_direct_reloc",
 };
@@ -45,6 +40,8 @@ static int is_safe_abs_reloc(const char* sym_name)
 			/* Match found */
 			return 1;
 	}
+	if (strncmp(sym_name, "VDSO", 4) == 0)
+		return 1;
 	if (strncmp(sym_name, "__crc_", 6) == 0)
 		return 1;
 	return 0;