From: Phil Carmody <pc+lkml@asdf.org>
To: sfr@canb.auug.org.au
Cc: Phil Carmody <pc+lkml@asdf.org>,
khilman@linaro.org, Linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] kvm: (ppc) stub out more functions in order to permit kernel to build
Date: Fri, 22 Mar 2013 01:59:56 +0200 [thread overview]
Message-ID: <1363910396-24604-1-git-send-email-pc+lkml@asdf.org> (raw)
Build failure mentioned by Stephen Rothwell here:
http://www.mail-archive.com/linuxppc-dev@lists.ozlabs.org/msg65408.html
Traced to:
commit f445f11eb2cc -"KVM: allow host header to be included even for !CONFIG_KVM"
This patch permits the build to progress by stubbing out the two functions
that it fell over on. I have no idea if that's even vaguely appropriate.
This has been .c->.o compile tested only, as g5_defconfig FTB elsewhere.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Phil Carmody <pc+lkml@asdf.org>
---
arch/powerpc/include/asm/kvm_ppc.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index 44a657a..262d9b7 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -20,6 +20,8 @@
#ifndef __POWERPC_KVM_PPC_H__
#define __POWERPC_KVM_PPC_H__
+#if IS_ENABLED(CONFIG_KVM)
+
/* This file exists just so we can dereference kvm_vcpu, avoiding nested header
* dependencies. */
@@ -324,4 +326,9 @@ static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb)
return ea;
}
+#else
+static inline void kvmppc_set_xics_phys(int cpu, unsigned long addr) { return; }
+static inline void kvm_linear_init(void) { return; }
+#endif /* IS_ENABLED(CONFIG_KVM) */
+
#endif /* __POWERPC_KVM_PPC_H__ */
--
1.7.2.5
reply other threads:[~2013-03-21 23:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1363910396-24604-1-git-send-email-pc+lkml@asdf.org \
--to=pc+lkml@asdf.org \
--cc=Linuxppc-dev@lists.ozlabs.org \
--cc=khilman@linaro.org \
--cc=sfr@canb.auug.org.au \
/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