From 95bcaed4cbbbc0fb6c193062f380d3611b31c65f Mon Sep 17 00:00:00 2001
From: Alexander Kartashov <alekskartashov@parallels.com>
Date: Wed, 16 Jan 2013 19:10:25 +0400
Subject: [PATCH] include/restorer.h: use the alias UserRegsEntry for
 UserX86RegsEntry

Signed-off-by: Alexander Kartashov <alekskartashov@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 arch/x86/include/asm/types.h | 4 ++++
 include/restorer.h           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index a639e7656..acf224c1e 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -7,6 +7,8 @@
 
 #include "asm/bitops.h"
 
+#include "../protobuf/core.pb-c.h"
+
 /* prctl */
 #define ARCH_SET_GS 0x1001
 #define ARCH_SET_FS 0x1002
@@ -276,4 +278,6 @@ typedef struct {
 
 #define CORE_THREAD_ARCH_INFO(core) core->thread_info
 
+typedef UserX86RegsEntry UserRegsEntry;
+
 #endif /* __CR_ASM_TYPES_H__ */
diff --git a/include/restorer.h b/include/restorer.h
index 172d64257..ea3663561 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -64,7 +64,7 @@ struct thread_restore_args {
 	struct restore_mem_zone		mem_zone;
 
 	int				pid;
-	UserX86RegsEntry		gpregs;
+	UserRegsEntry		        gpregs;
 	u64				clear_tid_addr;
 
 	bool				has_futex;