On Wed 21-11-12 11:55:16, Andrew Morton wrote:
> On Wed, 21 Nov 2012 16:47:34 +0100
> Michal Hocko <mhocko@xxxxxxx> wrote:
>
> > Bahh, my fault.
> > I screwed while reverting previous version of the virtio patchset.
> > Pushed to my tree. Thanks for reporting...
> >
> > On Wed 21-11-12 23:37:21, Wu Fengguang wrote:
> > > tree: git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git since-3.6
> > > head: 223cdc1faeea55aa70fef23d54720ad3fdaf4c93
> > > commit: 12cf48af8968fa1d0cc4c06065d7c37c3560c171 [456/496] virtio_balloon: introduce migration primitives to balloon pages
> > > config: make ARCH=x86_64 allmodconfig
> > ---
> > >From 35f423ffe01b62cbe5bf88b0acbff5b3b4a09777 Mon Sep 17 00:00:00 2001
> > From: Michal Hocko <mhocko@xxxxxxx>
> > Date: Wed, 21 Nov 2012 16:42:02 +0100
> > Subject: [PATCH] virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix-fix
> > mismerge fix
> >
> > %u got back to %zu while while reverting
> > %(4f2ac8495ba0477d8c3208de96dae7d1db6c2d49) obsolete version of
> > virtio_balloon: introduce migration primitives to balloon pages
> >
> > Signed-off-by: Michal Hocko <mhocko@xxxxxxx>
> > ---
> > drivers/virtio/virtio_balloon.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
> > index d0cfb7e..8cde4c9 100644
> > --- a/drivers/virtio/virtio_balloon.c
> > +++ b/drivers/virtio/virtio_balloon.c
> > @@ -141,7 +141,7 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num)
> > if (!page) {
> > if (printk_ratelimit())
> > dev_printk(KERN_INFO, &vb->vdev->dev,
> > - "Out of puff! Can't get %zu pages\n",
> > + "Out of puff! Can't get %u pages\n",
> > VIRTIO_BALLOON_PAGES_PER_PAGE);
> > /* Sleep for at least 1/5 of a second before retry. */
> > msleep(200);
>
> Yeah, that's quite old code - printk_ratelimit is naughty and has been
> replaced by dev_info_ratelimited().
Hmm, that one came in from linux-next (looks like Rusty's tree) and
not your tree so I haven't applied it. I can cherry pick (the last
linux-next knows it as 41395dfb: virtio: Convert dev_printk(KERN_<LEVEL>
to dev_<level>) of course.
>
> Are you using mmotm or http://ozlabs.org/~akpm/mmots/?
both. mmots every day (if there is a new one) and mmotm when it is
announced.
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>