* 2.6.34-rc6 regression: pcmcia no longer compiles @ 2010-05-04 4:14 ` Pavel Machek 0 siblings, 0 replies; 6+ messages in thread From: Pavel Machek @ 2010-05-04 4:14 UTC (permalink / raw) To: linux-arm-kernel Hi! -rc5 compiled ok with similar config. Now I get: CHK include/linux/version.h CHK include/generated/utsrelease.h make[1]: `include/generated/mach-types.h' is up to date. CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC drivers/pcmcia/pcmcia_ioctl.o drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_open': drivers/pcmcia/pcmcia_ioctl.c:714: error: 'struct <anonymous>' has no member named 'present' drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_read': drivers/pcmcia/pcmcia_ioctl.c:773: error: 'struct <anonymous>' has no member named 'dead' drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_ioctl': drivers/pcmcia/pcmcia_ioctl.c:841: error: 'struct <anonymous>' has no member named 'dead' make[2]: *** [drivers/pcmcia/pcmcia_ioctl.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2 make: *** [drivers] Error 2 -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* 2.6.34-rc6 regression: pcmcia no longer compiles @ 2010-05-04 4:14 ` Pavel Machek 0 siblings, 0 replies; 6+ messages in thread From: Pavel Machek @ 2010-05-04 4:14 UTC (permalink / raw) To: rpurdie, lenz, kernel list, arminlitzel, Cyril Hrubis, thommycheck, linux-arm-kernel, dbaryshkov, omegamoon, eric.y.miao, utx, zaurus-devel, Rafael J. Wysocki, linux-pcmcia Hi! -rc5 compiled ok with similar config. Now I get: CHK include/linux/version.h CHK include/generated/utsrelease.h make[1]: `include/generated/mach-types.h' is up to date. CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC drivers/pcmcia/pcmcia_ioctl.o drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_open': drivers/pcmcia/pcmcia_ioctl.c:714: error: 'struct <anonymous>' has no member named 'present' drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_read': drivers/pcmcia/pcmcia_ioctl.c:773: error: 'struct <anonymous>' has no member named 'dead' drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_ioctl': drivers/pcmcia/pcmcia_ioctl.c:841: error: 'struct <anonymous>' has no member named 'dead' make[2]: *** [drivers/pcmcia/pcmcia_ioctl.o] Error 1 make[1]: *** [drivers/pcmcia] Error 2 make: *** [drivers] Error 2 -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* 2.6.34-rc6 regression: pcmcia no longer compiles 2010-05-04 4:14 ` Pavel Machek @ 2010-05-04 11:33 ` Marc Zyngier -1 siblings, 0 replies; 6+ messages in thread From: Marc Zyngier @ 2010-05-04 11:33 UTC (permalink / raw) To: linux-arm-kernel On Tue, 4 May 2010 06:14:48 +0200, Pavel Machek <pavel@ucw.cz> wrote: > Hi! > > -rc5 compiled ok with similar config. > > Now I get: > > CHK include/linux/version.h > CHK include/generated/utsrelease.h > make[1]: `include/generated/mach-types.h' is up to date. > CALL scripts/checksyscalls.sh > CHK include/generated/compile.h > CC drivers/pcmcia/pcmcia_ioctl.o > drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_open': > drivers/pcmcia/pcmcia_ioctl.c:714: error: 'struct <anonymous>' has no > member named 'present' > drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_read': > drivers/pcmcia/pcmcia_ioctl.c:773: error: 'struct <anonymous>' has no > member named 'dead' > drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_ioctl': > drivers/pcmcia/pcmcia_ioctl.c:841: error: 'struct <anonymous>' has no > member named 'dead' > make[2]: *** [drivers/pcmcia/pcmcia_ioctl.o] Error 1 > make[1]: *** [drivers/pcmcia] Error 2 > make: *** [drivers] Error 2 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> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 2.6.34-rc6 regression: pcmcia no longer compiles @ 2010-05-04 11:33 ` Marc Zyngier 0 siblings, 0 replies; 6+ messages in thread From: Marc Zyngier @ 2010-05-04 11:33 UTC (permalink / raw) To: Pavel Machek Cc: rpurdie, lenz, kernel list, arminlitzel, Cyril Hrubis, thommycheck, linux-arm-kernel, dbaryshkov, omegamoon, eric.y.miao, utx, zaurus-devel, Rafael J. Wysocki, linux-pcmcia, linux [-- Attachment #1: Type: text/plain, Size: 1084 bytes --] On Tue, 4 May 2010 06:14:48 +0200, Pavel Machek <pavel@ucw.cz> wrote: > Hi! > > -rc5 compiled ok with similar config. > > Now I get: > > CHK include/linux/version.h > CHK include/generated/utsrelease.h > make[1]: `include/generated/mach-types.h' is up to date. > CALL scripts/checksyscalls.sh > CHK include/generated/compile.h > CC drivers/pcmcia/pcmcia_ioctl.o > drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_open': > drivers/pcmcia/pcmcia_ioctl.c:714: error: 'struct <anonymous>' has no > member named 'present' > drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_read': > drivers/pcmcia/pcmcia_ioctl.c:773: error: 'struct <anonymous>' has no > member named 'dead' > drivers/pcmcia/pcmcia_ioctl.c: In function 'ds_ioctl': > drivers/pcmcia/pcmcia_ioctl.c:841: error: 'struct <anonymous>' has no > member named 'dead' > make[2]: *** [drivers/pcmcia/pcmcia_ioctl.o] Error 1 > make[1]: *** [drivers/pcmcia] Error 2 > make: *** [drivers] Error 2 Does the attached patch fix it (compile-tested only)? M. -- Who you jivin' with that Cosmik Debris? [-- Attachment #2: 0001-pcmcia-fix-compilation-after-16bit-state-locking-cha.patch --] [-- Type: text/plain, Size: 1598 bytes --] 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* 2.6.34-rc6 regression: pcmcia no longer compiles 2010-05-04 11:33 ` Marc Zyngier @ 2010-05-04 20:19 ` Dominik Brodowski -1 siblings, 0 replies; 6+ messages in thread From: Dominik Brodowski @ 2010-05-04 20:19 UTC (permalink / raw) To: linux-arm-kernel > Does the attached patch fix it (compile-tested only)? Yes, it looks good -- many thanks! Applied your patch to pcmcia-urgent. Best, Dominik ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 2.6.34-rc6 regression: pcmcia no longer compiles @ 2010-05-04 20:19 ` Dominik Brodowski 0 siblings, 0 replies; 6+ messages in thread From: Dominik Brodowski @ 2010-05-04 20:19 UTC (permalink / raw) To: Marc Zyngier Cc: Pavel Machek, Rafael J. Wysocki, thommycheck, dbaryshkov, Cyril Hrubis, arminlitzel, linux-pcmcia, kernel list, utx, lenz, omegamoon, eric.y.miao, zaurus-devel, linux-arm-kernel > Does the attached patch fix it (compile-tested only)? Yes, it looks good -- many thanks! Applied your patch to pcmcia-urgent. Best, Dominik ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-05-04 20:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-05-04 4:14 2.6.34-rc6 regression: pcmcia no longer compiles Pavel Machek 2010-05-04 4:14 ` Pavel Machek 2010-05-04 11:33 ` Marc Zyngier 2010-05-04 11:33 ` Marc Zyngier 2010-05-04 20:19 ` Dominik Brodowski 2010-05-04 20:19 ` Dominik Brodowski
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.