From b99cac6c95f1008b36c455411faf2a08e287844c Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Tue, 11 Jun 2013 11:56:52 -0700
Subject: [PATCH] --- yaml --- r: 377073 b: refs/heads/master c:
 b1983b0a7578de09211a696802edab83fd253303 h: refs/heads/master i:   377071:
 9ebbb5da93da301f19d550de5e0d3011d116651e v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/tools/relocs.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e647e2694829..7d2ed845346e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de3d66b1387ddf5a37d9689e5eb8510fb75c765
+refs/heads/master: b1983b0a7578de09211a696802edab83fd253303
diff --git a/trunk/arch/x86/tools/relocs.c b/trunk/arch/x86/tools/relocs.c
index 590be1090892..f7bab68a4b83 100644
--- a/trunk/arch/x86/tools/relocs.c
+++ b/trunk/arch/x86/tools/relocs.c
@@ -42,9 +42,6 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
 	"^(xen_irq_disable_direct_reloc$|"
 	"xen_save_fl_direct_reloc$|"
 	"VDSO|"
-#if ELF_BITS == 64
-	"__vvar_page|"
-#endif
 	"__crc_)",
 
 /*
@@ -72,6 +69,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
 	"__per_cpu_load|"
 	"init_per_cpu__.*|"
 	"__end_rodata_hpage_align|"
+	"__vvar_page|"
 #endif
 	"_end)$"
 };