On Wed, Jan 06, 2010 at 08:52:11PM +0100, Arnd Bergmann wrote:
> > + switch (version) {
Open of first
> > + default: {
Open of second
> > + ulong raddr;
> > + ret = do_shmat(first, (char __user *)ptr,
> > + second, &raddr);
> > + if (ret)
> > + return ret;
> > + return put_user(raddr, (ulong __user *) third);
> > + }
close of second
> > +
> > +#if defined(__i386__) || defined(__frv__) || defined(__mips__) ||\
> > + defined(__mn10300__)
> > + case 1:
> > + /* iBCS2 emulator entry point */
> > + if (!segment_eq(get_fs(), get_ds()))
> > + return -EINVAL;
> > + /*
> > + * The "(ulong *) third" is valid _only_ because of
> > + * the kernel segment thing.
> > + */
> > + return do_shmat(first, (char __user *) ptr, second,
> > + (unsigned long *)third);
> > +#endif
> > +#if defined(__arm__) || defined(__sparc__)
> > + case 1:
> > + /* Of course, we don't support iBCS2! */
> > + return -EINVAL;
> > +#endif
> > + }
close of first.
> This would not build on any of the architecture mentioned, because of
> incorrect placement of curly braces, but as Al mentioned it should just
> go away entirely.
They look fine to me.
In any case, all three patches get my ack.
Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
