From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shaohua Li <shli@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: build failure after merge of the final tree (akpm tree related)
Date: Fri, 25 Jan 2013 10:22:39 +1100 [thread overview]
Message-ID: <20130125102239.18a936de6bc7f696e95ca9f5@canb.auug.org.au> (raw)
In-Reply-To: <20130124103040.GB10025@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1526 bytes --]
Hi,
On Thu, 24 Jan 2013 18:30:40 +0800 Shaohua Li <shli@kernel.org> wrote:
>
> On Thu, Jan 24, 2013 at 04:54:48PM +1100, Stephen Rothwell wrote:
> >
> > After merging the final tree, today's linux-next build (sparc32 defconfig)
> > failed like this:
> >
> > arch/sparc/mm/init_32.c: In function 'show_mem':
> > arch/sparc/mm/init_32.c:60:23: error: invalid operands to binary << (have 'atomic_long_t' and 'int')
> >
> > Caused by commit "swap: add per-partition lock for swapfile" from the
> > akpm tree.
> >
> > I have reverted that commit for today.
>
> can you please apply this:
>
>
> ---
> arch/sparc/mm/init_32.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux/arch/sparc/mm/init_32.c
> ===================================================================
> --- linux.orig/arch/sparc/mm/init_32.c 2012-08-06 16:00:44.133458270 +0800
> +++ linux/arch/sparc/mm/init_32.c 2013-01-24 18:28:23.242077473 +0800
> @@ -57,7 +57,7 @@ void show_mem(unsigned int filter)
> printk("Mem-info:\n");
> show_free_areas(filter);
> printk("Free swap: %6ldkB\n",
> - nr_swap_pages << (PAGE_SHIFT-10));
> + get_nr_swap_pages() << (PAGE_SHIFT-10));
> printk("%ld pages of RAM\n", totalram_pages);
> printk("%ld free pages\n", nr_free_pages());
> }
Please provide a proper patch to Andrew including a commit message and a
Signed-off-by and Reported-by lines.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-01-24 23:22 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 5:54 linux-next: build failure after merge of the final tree (akpm tree related) Stephen Rothwell
2013-01-24 10:30 ` Shaohua Li
2013-01-24 23:22 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-06-06 7:25 Stephen Rothwell
2013-06-06 7:15 Stephen Rothwell
2013-06-06 6:18 Stephen Rothwell
2013-03-04 3:28 Stephen Rothwell
2013-03-04 9:22 ` Jan Kara
2013-03-04 3:10 Stephen Rothwell
2013-03-06 23:52 ` Andrew Morton
2013-01-21 6:08 Stephen Rothwell
2013-01-21 7:17 ` Tang Chen
2012-11-09 4:16 Stephen Rothwell
2012-11-09 4:09 Stephen Rothwell
2012-11-14 22:18 ` Andrew Morton
2012-11-14 22:30 ` David Miller
2012-11-14 23:09 ` Andrew Morton
2012-11-14 23:10 ` David Miller
2012-11-09 3:58 Stephen Rothwell
2012-11-09 4:01 ` Andrew Morton
2012-11-12 0:00 ` Stephen Rothwell
2012-09-17 11:49 Stephen Rothwell
2012-09-13 8:11 Stephen Rothwell
2012-09-13 13:24 ` David Fries
2012-09-13 13:34 ` Stephen Rothwell
2012-09-14 4:20 ` David Fries
2012-09-13 8:01 Stephen Rothwell
2012-09-13 10:01 ` Shaohua Li
2012-09-13 12:29 ` Stephen Rothwell
2012-05-11 6:20 Stephen Rothwell
2012-03-14 23:44 Stephen Rothwell
2012-02-17 10:20 Stephen Rothwell
2012-02-17 12:06 ` Konstantin Khlebnikov
2012-02-19 23:04 ` Stephen Rothwell
2012-02-19 23:15 ` Andrew Morton
2012-02-17 5:30 Stephen Rothwell
2012-02-17 6:07 ` Benjamin Herrenschmidt
2012-01-20 2:02 Stephen Rothwell
2011-12-17 4:42 Stephen Rothwell
2011-12-17 5:02 ` NeilBrown
2011-11-30 4:52 Stephen Rothwell
2011-11-30 5:40 ` David Miller
2011-11-30 6:07 ` Andrew Morton
2011-11-30 11:48 ` Neil Horman
2011-11-30 4:42 Stephen Rothwell
2011-11-30 5:16 ` Andrew Morton
2011-10-05 8:23 Stephen Rothwell
2011-09-30 1:52 Stephen Rothwell
2011-09-28 10:01 Stephen Rothwell
2011-07-27 3:55 Stephen Rothwell
2011-07-01 5:45 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130125102239.18a936de6bc7f696e95ca9f5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shli@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).