diff options
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | utrace.patch | 71 |
2 files changed, 74 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index fb26d2c68..f919ce53f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2037,6 +2037,9 @@ fi # ||----w | # || || %changelog +* Fri Sep 02 2011 Dave Jones <davej@redhat.com> +- utrace: s390: fix the compile problem with traps.c (rhbz 735118) + * Tue Aug 30 2011 Dave Jones <davej@redhat.com> - Revert "x86: Serialize EFI time accesses on rtc_lock" (rhbz 732755) diff --git a/utrace.patch b/utrace.patch index c04ac77c8..fbf28ff62 100644 --- a/utrace.patch +++ b/utrace.patch @@ -7335,3 +7335,74 @@ index 90ca578..a1bac95 100644 1.5.5.1 +From davej Thu Sep 1 14:14:49 2011 +Return-Path: oleg@redhat.com +X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on + gelk.kernelslacker.org +X-Spam-Level: +X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD, + UNPARSEABLE_RELAY autolearn=ham version=3.3.2 +Received: from mail.corp.redhat.com [10.5.5.52] + by gelk with IMAP (fetchmail-6.3.20) + for <davej@localhost> (single-drop); Thu, 01 Sep 2011 14:14:49 -0400 (EDT) +Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO + zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by + mail04.corp.redhat.com with LMTP; Thu, 1 Sep 2011 14:13:55 -0400 (EDT) +Received: from localhost (localhost.localdomain [127.0.0.1]) + by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1BA199C63F; + Thu, 1 Sep 2011 14:13:55 -0400 (EDT) +Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1]) + by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 0vQx9zlcQB36; Thu, 1 Sep 2011 14:13:55 -0400 (EDT) +Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) + by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 009959C63D; + Thu, 1 Sep 2011 14:13:55 -0400 (EDT) +Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232]) + by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p81IDrDX015389; + Thu, 1 Sep 2011 14:13:54 -0400 +Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500 + oleg@redhat.com; Thu, 1 Sep 2011 20:10:54 +0200 (CEST) +Date: Thu, 1 Sep 2011 20:10:53 +0200 +From: Oleg Nesterov <oleg@redhat.com> +To: Dave Jones <davej@redhat.com> +Cc: kernel@lists.fedoraproject.org, cebbert@redhat.com +Subject: [PATCH F-16] bz735118: utrace: s390: fix the compile problem with + traps.c +Message-ID: <20110901181053.GA24990@redhat.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: Mutt/1.5.18 (2008-05-17) +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 +Status: RO +Content-Length: 777 +Lines: 27 + +https://bugzilla.redhat.com/show_bug.cgi?id=735118 + +d99e60e5 "tracehooks: reintroduce tracehook_consider_fatal_signal()" +breaks the compilation of arch/s390/kernel/traps.c. Restore the +necessary include removed by upstream 73b7d40f commit. + +Signed-off-by: Oleg Nesterov <oleg@redhat.com> +--- + arch/s390/kernel/traps.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c +index 1018ab6..50e975d 100644 +--- a/arch/s390/kernel/traps.c ++++ b/arch/s390/kernel/traps.c +@@ -18,7 +18,7 @@ + #include <linux/kernel.h> + #include <linux/string.h> + #include <linux/errno.h> +-#include <linux/ptrace.h> ++#include <linux/tracehook.h> + #include <linux/timer.h> + #include <linux/mm.h> + #include <linux/smp.h> +-- +1.5.5.1 + + |