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

Commit 5358a963 authored by Thomas Huth's avatar Thomas Huth Committed by Alexander Graf
Browse files

KVM: PPC: Fix warnings from sparse 



When compiling the KVM code for POWER with "make C=1", sparse
complains about functions missing proper prototypes and a 64-bit
constant missing the ULL prefix. Let's fix this by making the
functions static or by including the proper header with the
prototypes, and by appending a ULL prefix to the constant
PPC_MPPE_ADDRESS_MASK.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 129fd423

arch/powerpc/include/asm/ppc-opcode.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ 


/* POWER8 Micro Partition Prefetch (MPP) parameters */

/* Address mask is common for LOGMPP instruction and MPPR SPR */

#define PPC_MPPE_ADDRESS_MASK 0xffffffffc000

#define PPC_MPPE_ADDRESS_MASK 0xffffffffc000ULL



/* Bits 60 and 61 of MPP SPR should be set to one of the following */

/* Aborting the fetch is indeed setting 00 in the table size bits */

arch/powerpc/kvm/book3s.c

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, ulong flags) 
	kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_INST_STORAGE);

}



int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority)

static int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu,

					 unsigned int priority)

{

	int deliver = 1;

	int vec = 0;

arch/powerpc/kvm/book3s_32_mmu_host.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/machdep.h>

#include <asm/mmu_context.h>

#include <asm/hw_irq.h>

#include "book3s.h"



/* #define DEBUG_MMU */

/* #define DEBUG_SR */

arch/powerpc/kvm/book3s_64_mmu_host.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/mmu_context.h>

#include <asm/hw_irq.h>

#include "trace_pr.h"

#include "book3s.h"



#define PTE_SIZE 12

arch/powerpc/kvm/book3s_emulate.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/reg.h>

#include <asm/switch_to.h>

#include <asm/time.h>

#include "book3s.h"



#define OP_19_XOP_RFID		18

#define OP_19_XOP_RFI		50