Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 989044ee authored Aug 30, 2010 by Alexander Graf Committed by Avi Kivity Oct 24, 2010

KVM: PPC: Fix CONFIG_KVM_GUEST && !CONFIG_KVM case



When CONFIG_KVM_GUEST is selected, but CONFIG_KVM is not, we were missing
some defines in asm-offsets.c and included too many headers at other places.

This patch makes above configuration work.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

parent 6230f7fc

arch/powerpc/kernel/asm-offsets.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -48,11 +48,11 @@
		#ifdef CONFIG_PPC_ISERIES
		#include <asm/iseries/alpaca.h>
		#endif
		#ifdef CONFIG_KVM
		#if defined(CONFIG_KVM) \|\| defined(CONFIG_KVM_GUEST)
		#include <linux/kvm_host.h>
		#ifndef CONFIG_BOOKE
		#include <asm/kvm_book3s.h>
		#endif
		#if defined(CONFIG_KVM) && defined(CONFIG_PPC_BOOK3S)
		#include <asm/kvm_book3s.h>
		#endif

		#ifdef CONFIG_PPC32

arch/powerpc/kernel/kvm.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <linux/of.h>

		#include <asm/reg.h>
		#include <asm/kvm_ppc.h>
		#include <asm/sections.h>
		#include <asm/cacheflush.h>
		#include <asm/disassemble.h>