From 1c48be1fcbd558fb6f08479ce416f89ed184c7b5 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Mon, 16 May 2011 13:41:58 +0100
Subject: [PATCH] x86-64: remove left over uses of .got entries

These were caused by some declarations happening before the compiler
would have seen the visibility pragma.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
xen-unstable changeset:   23345:ba4bd20e581a
xen-unstable date:        Mon May 16 13:32:37 2011 +0100
---
 xen/include/xen/config.h | 5 +++--
 xen/include/xen/ctype.h  | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index 7872f13e8d..a52298ea3b 100644
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -7,6 +7,9 @@
 #ifndef __XEN_CONFIG_H__
 #define __XEN_CONFIG_H__
 
+#ifndef __ASSEMBLY__
+#include <xen/compiler.h>
+#endif
 #include <asm/config.h>
 
 #define EXPORT_SYMBOL(var)
@@ -75,8 +78,6 @@ int current_domain_id(void);
     printk(XENLOG_GUEST _l "%s:%d:d%d " _f, __FILE__,       \
            __LINE__, current_domain_id() , ## _a )
 
-#include <xen/compiler.h>
-
 #endif /* !__ASSEMBLY__ */
 
 #define __STR(...) #__VA_ARGS__
diff --git a/xen/include/xen/ctype.h b/xen/include/xen/ctype.h
index 6dec944a37..f6520e7194 100644
--- a/xen/include/xen/ctype.h
+++ b/xen/include/xen/ctype.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_CTYPE_H
 #define _LINUX_CTYPE_H
 
+#include <xen/config.h>
+
 /*
  * NOTE! This ctype does not handle EOF like the standard C
  * library is required to.
-- 
2.39.5