From 560ca54e16a262fa9b148ed7a1e2a9185f93350b Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Mon, 3 Sep 2012 17:02:16 +0200
Subject: [PATCH] --- yaml --- r: 323854 b: refs/heads/master c:
 baedbf02b1912225d60dd7403acb4b4e003088b5 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/uprobes.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 52fe12b3953e..d684ddd109bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a00b35e411519d774d978cdf80e4406d01b36b
+refs/heads/master: baedbf02b1912225d60dd7403acb4b4e003088b5
diff --git a/trunk/arch/x86/include/asm/uprobes.h b/trunk/arch/x86/include/asm/uprobes.h
index d561ff5a3d4d..8ff8be7835ab 100644
--- a/trunk/arch/x86/include/asm/uprobes.h
+++ b/trunk/arch/x86/include/asm/uprobes.h
@@ -42,10 +42,10 @@ struct arch_uprobe {
 };
 
 struct arch_uprobe_task {
-	unsigned long			saved_trap_nr;
 #ifdef CONFIG_X86_64
 	unsigned long			saved_scratch_register;
 #endif
+	unsigned int			saved_trap_nr;
 	unsigned int			saved_tf;
 };