X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Fia32%2Fptrace32.c;h=f3b7d31fccede4d6debc3869cb29d66b760c317c;hb=refs%2Fheads%2Fvserver;hp=e8dcff98b5fd962691d3746c1d2f3cd7f0d64583;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c
index e8dcff98b..f3b7d31fc 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86_64/ia32/ptrace32.c
@@ -578,8 +578,7 @@ static const struct utrace_regset ia32_regsets[] = {
 
 const struct utrace_regset_view utrace_ia32_view = {
 	.name = "i386", .e_machine = EM_386,
-	.regsets = ia32_regsets,
-	.n = sizeof ia32_regsets / sizeof ia32_regsets[0],
+	.regsets = ia32_regsets, .n = ARRAY_SIZE(ia32_regsets)
 };
 EXPORT_SYMBOL_GPL(utrace_ia32_view);
 
@@ -591,15 +590,17 @@ EXPORT_SYMBOL_GPL(utrace_ia32_view);
 
 static const struct ptrace_layout_segment ia32_uarea[] = {
 	{0, sizeof(struct user_regs_struct32), 0, 0},
+	{sizeof(struct user_regs_struct32),
+	 offsetof(struct user32, u_debugreg[0]), -1, 0},
 	{offsetof(struct user32, u_debugreg[0]),
 	 offsetof(struct user32, u_debugreg[8]), 4, 0},
 	{0, 0, -1, 0}
 };
 
-fastcall int arch_compat_ptrace(compat_long_t *req, struct task_struct *child,
-				struct utrace_attached_engine *engine,
-				compat_ulong_t addr, compat_ulong_t data,
-				compat_long_t *val)
+int arch_compat_ptrace(compat_long_t *req, struct task_struct *child,
+		       struct utrace_attached_engine *engine,
+		       compat_ulong_t addr, compat_ulong_t data,
+		       compat_long_t *val)
 {
 	switch (*req) {
 	case PTRACE_PEEKUSR: