From: Oleg Nesterov <oleg@redhat.com>
Date: Mon, 3 Sep 2012 15:02:16 +0000 (+0200)
Subject: uprobes: Make arch_uprobe_task->saved_trap_nr "unsigned int"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=baedbf02b1912225d60dd7403acb4b4e003088b5;p=openwrt%2Fstaging%2Fblogic.git

uprobes: Make arch_uprobe_task->saved_trap_nr "unsigned int"

Make arch_uprobe_task->saved_trap_nr "unsigned int" and move it down
after ->saved_scratch_register, this changes sizeof() from 24 to 16.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
---

diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
index d561ff5a3d4d..8ff8be7835ab 100644
--- a/arch/x86/include/asm/uprobes.h
+++ b/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;
 };