Subject: Re: linux-next: build failure after merge of the final tree (akpm tree related)

From: Shaohua Li <[email-masked]>
Date: Thu, 24 Jan 2013 18:30:40 +0800

On Thu, Jan 24, 2013 at 04:54:48PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> 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());
 }