From 1ed2db6381a0aaba15ecc65ebaa6271679229ce5 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Thu, 10 Sep 2009 19:53:06 -0400
Subject: [PATCH] --- yaml --- r: 169417 b: refs/heads/master c:
 ad5cafcdb09c57008c990edd309c0a563b09f238 h: refs/heads/master i:   169415:
 1caca28bce0bb7a4a9dc4e467956de3091368479 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/ptrace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd22e246bc22..60650e96e203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a00e817f42663941ea0aa5f85a9d1c4f8b212839
+refs/heads/master: ad5cafcdb09c57008c990edd309c0a563b09f238
diff --git a/trunk/arch/x86/kernel/ptrace.c b/trunk/arch/x86/kernel/ptrace.c
index a33a17d5d5c8..caffb6809452 100644
--- a/trunk/arch/x86/kernel/ptrace.c
+++ b/trunk/arch/x86/kernel/ptrace.c
@@ -150,7 +150,7 @@ static const int arg_offs_table[] = {
 unsigned long regs_get_argument_nth(struct pt_regs *regs, unsigned int n)
 {
 	if (n < ARRAY_SIZE(arg_offs_table))
-		return *((unsigned long *)regs + arg_offs_table[n]);
+		return *(unsigned long *)((char *)regs + arg_offs_table[n]);
 	else {
 		/*
 		 * The typical case: arg n is on the stack.