From 7c421026e070d836ece78218b7b45a64981b50f6 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Fri, 8 Feb 2008 12:09:57 -0800
Subject: [PATCH] --- yaml --- r: 88587 b: refs/heads/master c:
 c3e6ff87a3ad9124a67e149e4f9c080626a0d83e h: refs/heads/master i:   88585:
 be620ebcd98a0fcd9f133d3ea86fb3634986b34c   88583:
 b735c777ce04aab37829f1b85e41a1aea5f5850e v: v3

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

diff --git a/[refs] b/[refs]
index d478c0a87a42..35baddad9707 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9902a702c76f904be0057f8647dda9d6f89d4847
+refs/heads/master: c3e6ff87a3ad9124a67e149e4f9c080626a0d83e
diff --git a/trunk/arch/x86/kernel/ptrace.c b/trunk/arch/x86/kernel/ptrace.c
index eb92ccbb3502..559c1b027417 100644
--- a/trunk/arch/x86/kernel/ptrace.c
+++ b/trunk/arch/x86/kernel/ptrace.c
@@ -1456,7 +1456,6 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
 /* notification of system call entry/exit
  * - triggered by current->work.syscall_trace
  */
-__attribute__((regparm(3)))
 int do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
 	int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU);
diff --git a/trunk/arch/x86/kernel/signal_32.c b/trunk/arch/x86/kernel/signal_32.c
index b1e97e80a57c..a393e3711e08 100644
--- a/trunk/arch/x86/kernel/signal_32.c
+++ b/trunk/arch/x86/kernel/signal_32.c
@@ -654,7 +654,6 @@ static void do_signal(struct pt_regs *regs)
  * notification of userspace execution resumption
  * - triggered by the TIF_WORK_MASK flags
  */
-__attribute__((regparm(3)))
 void do_notify_resume(struct pt_regs *regs, void *_unused,
 		      __u32 thread_info_flags)
 {