From patchwork Wed Mar 14 14:43:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 10333 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1S7pR1-0005zg-LT for patchwork@linuxtv.org; Wed, 14 Mar 2012 15:44:15 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1S7pR0-0006fI-EM; Wed, 14 Mar 2012 15:44:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754381Ab2CNOoM (ORCPT ); Wed, 14 Mar 2012 10:44:12 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:56506 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752328Ab2CNOoK (ORCPT ); Wed, 14 Mar 2012 10:44:10 -0400 Received: by eekc41 with SMTP id c41so927097eek.19 for ; Wed, 14 Mar 2012 07:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=5FWal1qhTYzM949rw7OMwxDLSw8zSGPw+4DDsbSJ6fY=; b=ahuhEtUNN3nZ/8er4Saung+NdY+fKjYhothkb8SyTazt0p5TAd8toVrfGoBtvJzmkG XL6kyjK3pcrSWkLnrKNa99Br3RJaSsNzF/XydM0QDiq/suwn2EXs2wET0La0gqpH1XJN WfrnbZBip4UN16lC+Jk7AezFWydVMX1oGRdAOsvDNafdoJQS76zzYH6hVmfziIvh6Ehz GsE8lWW5EUnEXVvUSDH4f7G6W8FiDiy37dVh7eUgl7C4EGyjM0GOZGerATQrj/L0E4SD zrWMOnOZyIgvZ02NF0ukG4PZ3aTIavjizEUsRi4Gbv90qUzNHOdx6oMvJpJVcjBVu6gG edYQ== Received: by 10.14.51.207 with SMTP id b55mr406545eec.53.1331736248769; Wed, 14 Mar 2012 07:44:08 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id y11sm14156654eem.3.2012.03.14.07.44.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Mar 2012 07:44:07 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com Cc: Gianluca Gennari Subject: [PATCH] media_build: add new backport patch v2.6.35_kfifo.patch Date: Wed, 14 Mar 2012 15:43:58 +0100 Message-Id: <1331736238-28277-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.3.14.143637 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' The media_build tree fails to build with kernels 2.6.33, .34 and .35: In file included from /home/hans/work/build/media_build/v4l/rc-main.c:22:0: /home/hans/work/build/media_build/v4l/rc-core-priv.h:38:26: error: field 'kfifo' has incomplete type make[3]: *** [/home/hans/work/build/media_build/v4l/rc-main.o] Error 1 make[3]: *** Waiting for unfinished jobs.... This is due to patch http://patchwork.linuxtv.org/patch/9914/ . Patch http://patchwork.linuxtv.org/patch/10274/ fixed the issue with 2.6.32, but the proper fix is to revert patch 9914 for kernel 2.6.35, adding a new backport patch. Tested with kernels 2.6.32 and 2.6.33. Signed-off-by: Gianluca Gennari --- backports/backports.txt | 1 + backports/v2.6.32_kfifo.patch | 2 +- backports/v2.6.35_kfifo.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletions(-) create mode 100644 backports/v2.6.35_kfifo.patch diff --git a/backports/backports.txt b/backports/backports.txt index 8219033..54d41fd 100644 --- a/backports/backports.txt +++ b/backports/backports.txt @@ -48,6 +48,7 @@ add v2.6.35_vm_prev.patch add v2.6.35_firedtv_handle_fcp.patch add v2.6.35_i2c_new_probed_device.patch add v2.6.35_work_handler.patch +add v2.6.35_kfifo.patch [2.6.34] add v2.6.34_dvb_net.patch diff --git a/backports/v2.6.32_kfifo.patch b/backports/v2.6.32_kfifo.patch index 88a435a..10075b9 100644 --- a/backports/v2.6.32_kfifo.patch +++ b/backports/v2.6.32_kfifo.patch @@ -14,7 +14,7 @@ struct list_head list; /* to keep track of raw clients */ struct task_struct *thread; spinlock_t lock; -- struct kfifo_rec_ptr_1 kfifo; /* fifo for the pulse/space durations */ +- struct kfifo kfifo; /* fifo for the pulse/space durations */ + struct kfifo *kfifo; /* fifo for the pulse/space durations */ ktime_t last_event; /* when last event occurred */ enum raw_event_type last_type; /* last event type */ diff --git a/backports/v2.6.35_kfifo.patch b/backports/v2.6.35_kfifo.patch new file mode 100644 index 0000000..6837f27 --- /dev/null +++ b/backports/v2.6.35_kfifo.patch @@ -0,0 +1,17 @@ +--- + drivers/media/rc/rc-core-priv.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h +index 96f0a8b..b72f858 100644 +--- a/drivers/media/rc/rc-core-priv.h ++++ b/drivers/media/rc/rc-core-priv.h +@@ -35,7 +35,7 @@ struct ir_raw_event_ctrl { + struct list_head list; /* to keep track of raw clients */ + struct task_struct *thread; + spinlock_t lock; +- struct kfifo_rec_ptr_1 kfifo; /* fifo for the pulse/space durations */ ++ struct kfifo kfifo; /* fifo for the pulse/space durations */ + ktime_t last_event; /* when last event occurred */ + enum raw_event_type last_type; /* last event type */ + struct rc_dev *dev; /* pointer to the parent rc_dev */