From 952881873d5e8bb2e31514bc42e8e1087497ea60 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 6 Aug 2013 09:29:34 +0100
Subject: [PATCH Lucid SRU] Revert "x86, ptrace: fix build breakage with gcc 4.7"
BugLink: http://bugs.launchpad.net/bugs/1199154
This reverts commit d4b500dfb8b64f0bf4359cb5d77a68bb521697ff.
This stable update patch causes a libc-dev regression in an attempt
to support gcc-4.7 which isn't relevant for Lucid (gcc-4.4).
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
arch/x86/include/asm/ptrace.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
@@ -2,7 +2,6 @@
#define _ASM_X86_PTRACE_H
#include <linux/compiler.h> /* For __user */
-#include <linux/linkage.h> /* For asmregparm */
#include <asm/ptrace-abi.h>
#include <asm/processor-flags.h>
@@ -143,8 +142,8 @@ extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
int error_code, int si_code);
void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
-extern asmregparm long syscall_trace_enter(struct pt_regs *);
-extern asmregparm void syscall_trace_leave(struct pt_regs *);
+extern long syscall_trace_enter(struct pt_regs *);
+extern void syscall_trace_leave(struct pt_regs *);
static inline unsigned long regs_return_value(struct pt_regs *regs)
{
--
1.7.9.5