Prev: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
Next: [PATCH] FLAT: allow arches to declare a larger alignment than the slab
From: Linus Torvalds on 25 May 2010 15:20 On Tue, 25 May 2010, tip-bot for Thomas Gleixner wrote: > { > - unsigned long expires_limit, mask; > + unsigned long expires_limit, mask, now; > int bit; > > expires_limit = expires; > > - if (timer->slack > -1) > + if (timer->slack >= 0) { > expires_limit = expires + timer->slack; > - else if (time_after(expires, jiffies)) /* auto slack: use 0.4% */ > - expires_limit = expires + (expires - jiffies)/256; > - > + } else { > + now = jiffies; So this works, but I'd really suggest that you actually nest the declarations correctly too. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |