On Thu, Aug 07, 2014 at 10:13:55AM -0700, Greg Kroah-Hartman wrote:
> On Wed, Aug 06, 2014 at 08:24:17AM -0700, Greg Kroah-Hartman wrote:
> > On Wed, Aug 06, 2014 at 04:16:20PM +0100, Luis Henriques wrote:
> > > On Tue, Aug 05, 2014 at 11:14:04AM -0700, Greg Kroah-Hartman wrote:
> > > <...>
> > > > @@ -188,17 +193,21 @@ static void note_page(struct seq_file *m
> > > > /*
> > > > * Now print the actual finished series
> > > > */
> > > > - seq_printf(m, "0x%0*lx-0x%0*lx ",
> > > > - width, st->start_address,
> > > > - width, st->current_address);
> > > > -
> > > > - delta = (st->current_address - st->start_address) >> 10;
> > > > - while (!(delta & 1023) && unit[1]) {
> > > > - delta >>= 10;
> > > > - unit++;
> > > > + if (!st->marker->max_lines ||
> > > > + st->lines < st->marker->max_lines) {
> > > > + seq_printf(m, "0x%0*lx-0x%0*lx ",
> > > > + width, st->start_address,
> > > > + width, st->current_address);
> > > > +
> > > > + delta = (st->current_address -
> > > > st->start_address) >> 10;
> > > > + while (!(delta & 1023) && unit[1]) {
> > > > + delta >>= 10;
> > > > + unit++;
> > > > + }
> > > > + seq_printf(m, "%9lu%c ", delta, *unit);
> > > > + printk_prot(m, st->current_prot, st->level);
> > > > }
> > > > - seq_printf(m, "%9lu%c ", delta, *unit);
> > > > - printk_prot(m, st->current_prot, st->level);
> > > > + st->lines++;
> > > >
> > > > /*
> > > > * We print markers for special areas of address space,
> > >
> > > Hmm... the original commit has a 2nd hunk here that does seem to be
> > > applicable to 3.10. Was this dropped accidentally or on purpose?
> >
> > I don't remember at all, sorry. What is the hunk that I missed?
>
> You are right, I somehow missed that, thanks. I've also now fixed up
> the ">> 10" change as well. Good thing this is just in debugging code
> :)
And I messed it up on the 3.4 patch as well, so I'll go fix that one up
too...
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
