From b42e31061cc5b8ad5e166531bd79df246477c58e Mon Sep 17 00:00:00 2001
From: Daniel Kiper <dkiper@net-space.pl>
Date: Wed, 4 May 2011 20:17:21 +0200
Subject: [PATCH] --- yaml --- r: 245250 b: refs/heads/master c:
 ae15a3b4d1374b733016ce4b4148b2ba42bbeb0f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a1a3a9a6d9ed..8e741f155fa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad3062a0f438a5f436dae267f795c0a9686f11d2
+refs/heads/master: ae15a3b4d1374b733016ce4b4148b2ba42bbeb0f
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
index 90bac0aac3a5..d3663df2f967 100644
--- a/trunk/arch/x86/xen/setup.c
+++ b/trunk/arch/x86/xen/setup.c
@@ -50,7 +50,7 @@ phys_addr_t xen_extra_mem_start, xen_extra_mem_size;
  */
 #define EXTRA_MEM_RATIO		(10)
 
-static __init void xen_add_extra_mem(unsigned long pages)
+static void __init xen_add_extra_mem(unsigned long pages)
 {
 	unsigned long pfn;
 
@@ -336,7 +336,7 @@ static void __init fiddle_vdso(void)
 #endif
 }
 
-static __cpuinit int register_callback(unsigned type, const void *func)
+static int __cpuinit register_callback(unsigned type, const void *func)
 {
 	struct callback_register callback = {
 		.type = type,