---

yaml --- r: 323854 b: refs/heads/master c: baedbf0 h: refs/heads/master v: v3
git-mirror · Sep 15, 2012 · 560ca54 · 560ca54
1 parent c769bca
commit 560ca54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 };