Subject: linux-next: build failure after merge of the ida tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 5 Jul 2018 14:36:26 +1000

Hi all,

After merging the ida tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/kernel.h:14:0,
                 from include/asm-generic/bug.h:18,
                 from arch/powerpc/include/asm/bug.h:128,
                 from include/linux/bug.h:5,
                 from arch/powerpc/include/asm/mmu.h:126,
                 from arch/powerpc/include/asm/lppaca.h:36,
                 from arch/powerpc/include/asm/paca.h:21,
                 from arch/powerpc/include/asm/current.h:16,
                 from include/linux/mutex.h:14,
                 from arch/powerpc/platforms/powernv/vas-window.c:13:
arch/powerpc/platforms/powernv/vas-window.c: In function 'vas_assign_window_id':
arch/powerpc/platforms/powernv/vas-window.c:528:42: error: 'VAX_WINDOWS_PER_CHIP' undeclared (first use in this function); did you mean 'VAS_WINDOWS_PER_CHIP'?
   pr_err("Too many (%d) open windows\n", VAX_WINDOWS_PER_CHIP);
                                          ^
include/linux/printk.h:304:33: note: in definition of macro 'pr_err'
  printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
                                 ^~~~~~~~~~~
arch/powerpc/platforms/powernv/vas-window.c:528:42: note: each undeclared identifier is reported only once for each function it appears in
   pr_err("Too many (%d) open windows\n", VAX_WINDOWS_PER_CHIP);
                                          ^
include/linux/printk.h:304:33: note: in definition of macro 'pr_err'
  printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
                                 ^~~~~~~~~~~

Caused by commit

  bbf959d51112 ("ppc: Convert vas ID allocation to new IDA API")

I applied the following fix patch for today:

From: Stephen Rothwell <[email-masked]>
Date: Thu, 5 Jul 2018 14:33:40 +1000
Subject: [PATCH] ppc: fixup for "Convert vas ID allocation to new IDA API"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 arch/powerpc/platforms/powernv/vas-window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c
index d313b38846eb..97c9b4863609 100644
--- a/arch/powerpc/platforms/powernv/vas-window.c
+++ b/arch/powerpc/platforms/powernv/vas-window.c
@@ -525,7 +525,7 @@ static int vas_assign_window_id(struct ida *ida)
 	int winid = ida_alloc_max(ida, VAS_WINDOWS_PER_CHIP, GFP_KERNEL);
 
 	if (winid == -ENOSPC) {
-		pr_err("Too many (%d) open windows\n", VAX_WINDOWS_PER_CHIP);
+		pr_err("Too many (%d) open windows\n", VAS_WINDOWS_PER_CHIP);
 		return -EAGAIN;
 	}
 
-- 
2.17.1

-- 
Cheers,
Stephen Rothwell