Hi Paul,
After merging the kvm-ppc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
arch/powerpc/kvm/book3s_xive.c: In function 'xive_debugfs_init':
arch/powerpc/kvm/book3s_xive.c:1852:52: error: 'powerpc_debugfs_root' undeclared (first use in this function)
xive->dentry = debugfs_create_file(name, S_IRUGO, powerpc_debugfs_root,
^
Caused by commit
5af50993850a ("KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller")
interacting with commit
7644d5819cf8 ("powerpc: Create asm/debugfs.h and move powerpc_debugfs_root there")
from the powerpc tree.
I have added the following merge fix patch.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 28 Apr 2017 14:28:17 +1000
Subject: [PATCH] powerpc: merge fix for powerpc_debugfs_root move.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
arch/powerpc/kvm/book3s_xive.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index 7807ee17af4b..ffe1da95033a 100644
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -24,6 +24,7 @@
#include <asm/xive.h>
#include <asm/xive-regs.h>
#include <asm/debug.h>
+#include <asm/debugfs.h>
#include <asm/time.h>
#include <asm/opal.h>
--
2.11.0
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
