diff for duplicates of <c79eb84d24e70983f4422c89a35580ff@localhost> diff --git a/a/1.txt b/N1/1.txt index b4af6f8..a43c08f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,3 @@ Does the attached patch fix it (compile-tested only)? M. -- Who you jivin' with that Cosmik Debris? --------------- next part -------------- -An embedded and charset-unspecified text was scrubbed... -Name: 0001-pcmcia-fix-compilation-after-16bit-state-lockin" filename*1*="g-cha.patch -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100504/757d0b59/attachment.el> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..7422419 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,7 @@ +Content-Transfer-Encoding: base64 +Content-Type: text/plain; + name*0*="UTF-8''0001-pcmcia-fix-compilation-after-16bit-state-locking-ch" + name*1*="a.patch"; +Content-Disposition: attachment; + filename*0*="UTF-8''0001-pcmcia-fix-compilation-after-16bit-state-lockin" + filename*1*="g-cha.patch"; diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..fbb1919 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,49 @@ +From 7d289f9b062e1b17e985c7898f8824e2417d783c Mon Sep 17 00:00:00 2001 +From: Marc Zyngier <maz@misterjones.org> +Date: Tue, 4 May 2010 12:21:53 +0100 +Subject: [PATCH] pcmcia: fix compilation after 16bit state locking changes + +Commit 04de0816 (pcmcia: pcmcia_dev_present bugfix) broke the +deprecated ioctl layer. Fix it by getting rid of references to +unexisting fields. + +Signed-off-by: Marc Zyngier <maz@misterjones.org> +Reported-by: Pavel Machek <pavel@ucw.cz> +--- + drivers/pcmcia/pcmcia_ioctl.c | 7 +------ + 1 files changed, 1 insertions(+), 6 deletions(-) + +diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c +index 104e73d..7631faa 100644 +--- a/drivers/pcmcia/pcmcia_ioctl.c ++++ b/drivers/pcmcia/pcmcia_ioctl.c +@@ -711,7 +711,7 @@ static int ds_open(struct inode *inode, struct file *file) + warning_printed = 1; + } + +- if (s->pcmcia_state.present) ++ if (atomic_read(&s->present)) + queue_event(user, CS_EVENT_CARD_INSERTION); + out: + unlock_kernel(); +@@ -770,9 +770,6 @@ static ssize_t ds_read(struct file *file, char __user *buf, + return -EIO; + + s = user->socket; +- if (s->pcmcia_state.dead) +- return -EIO; +- + ret = wait_event_interruptible(s->queue, !queue_empty(user)); + if (ret == 0) + ret = put_user(get_queued_event(user), (int __user *)buf) ? -EFAULT : 4; +@@ -838,8 +835,6 @@ static int ds_ioctl(struct inode *inode, struct file *file, + return -EIO; + + s = user->socket; +- if (s->pcmcia_state.dead) +- return -EIO; + + size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; + if (size > sizeof(ds_ioctl_arg_t)) +-- +1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index 33ed3b3..59f2336 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,24 @@ "ref\020100504041448.GA2893@ucw.cz\0" - "From\0maz@misterjones.org (Marc Zyngier)\0" - "Subject\02.6.34-rc6 regression: pcmcia no longer compiles\0" + "From\0Marc Zyngier <maz@misterjones.org>\0" + "Subject\0Re: 2.6.34-rc6 regression: pcmcia no longer compiles\0" "Date\0Tue, 04 May 2010 13:33:54 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Pavel Machek <pavel@ucw.cz>\0" + "Cc\0<rpurdie@rpsys.net>" + <lenz@cs.wisc.edu> + kernel list <linux-kernel@vger.kernel.org> + <arminlitzel@web.de> + Cyril Hrubis <metan@ucw.cz> + <thommycheck@gmail.com> + linux-arm-kernel <linux-arm-kernel@lists.infradead.org> + <dbaryshkov@gmail.com> + <omegamoon@gmail.com> + <eric.y.miao@gmail.com> + <utx@penguin.cz> + <zaurus-devel@www.linuxtogo.org> + Rafael J. Wysocki <rjw@sisk.pl> + <linux-pcmcia@lists.infradead.org> + " <linux@dominikbrodowski.net>\0" + "\01:1\0" "b\0" "On Tue, 4 May 2010 06:14:48 +0200, Pavel Machek <pavel@ucw.cz> wrote:\n" "> Hi!\n" @@ -35,10 +50,58 @@ "\n" " M.\n" "-- \n" - "Who you jivin' with that Cosmik Debris?\n" - "-------------- next part --------------\n" - "An embedded and charset-unspecified text was scrubbed...\n" - "Name: 0001-pcmcia-fix-compilation-after-16bit-state-lockin\" filename*1*=\"g-cha.patch\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100504/757d0b59/attachment.el> + Who you jivin' with that Cosmik Debris? + "\01:2\0" + "fn\00001-pcmcia-fix-compilation-after-16bit-state-locking-cha.patch\0" + "b\0" + "From 7d289f9b062e1b17e985c7898f8824e2417d783c Mon Sep 17 00:00:00 2001\n" + "From: Marc Zyngier <maz@misterjones.org>\n" + "Date: Tue, 4 May 2010 12:21:53 +0100\n" + "Subject: [PATCH] pcmcia: fix compilation after 16bit state locking changes\n" + "\n" + "Commit 04de0816 (pcmcia: pcmcia_dev_present bugfix) broke the\n" + "deprecated ioctl layer. Fix it by getting rid of references to\n" + "unexisting fields.\n" + "\n" + "Signed-off-by: Marc Zyngier <maz@misterjones.org>\n" + "Reported-by: Pavel Machek <pavel@ucw.cz>\n" + "---\n" + " drivers/pcmcia/pcmcia_ioctl.c | 7 +------\n" + " 1 files changed, 1 insertions(+), 6 deletions(-)\n" + "\n" + "diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c\n" + "index 104e73d..7631faa 100644\n" + "--- a/drivers/pcmcia/pcmcia_ioctl.c\n" + "+++ b/drivers/pcmcia/pcmcia_ioctl.c\n" + "@@ -711,7 +711,7 @@ static int ds_open(struct inode *inode, struct file *file)\n" + " \t warning_printed = 1;\n" + " }\n" + " \n" + "- if (s->pcmcia_state.present)\n" + "+ if (atomic_read(&s->present))\n" + " \tqueue_event(user, CS_EVENT_CARD_INSERTION);\n" + " out:\n" + " unlock_kernel();\n" + "@@ -770,9 +770,6 @@ static ssize_t ds_read(struct file *file, char __user *buf,\n" + " \treturn -EIO;\n" + " \n" + " s = user->socket;\n" + "- if (s->pcmcia_state.dead)\n" + "-\treturn -EIO;\n" + "-\n" + " ret = wait_event_interruptible(s->queue, !queue_empty(user));\n" + " if (ret == 0)\n" + " \tret = put_user(get_queued_event(user), (int __user *)buf) ? -EFAULT : 4;\n" + "@@ -838,8 +835,6 @@ static int ds_ioctl(struct inode *inode, struct file *file,\n" + " \treturn -EIO;\n" + " \n" + " s = user->socket;\n" + "- if (s->pcmcia_state.dead)\n" + "-\treturn -EIO;\n" + " \n" + " size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;\n" + " if (size > sizeof(ds_ioctl_arg_t))\n" + "-- \n" + 1.7.0.4 -a537879d0ef640840b2336f5f83d7e8649271f950db9582db78a1cd848d98700 +34af8c249cc7e46c26a9165089b10e4d53150937d04a1c3694d1c610e5da90cc
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.