The powerpc code uses some PAPR hypercalls, of which we need the hypercall number. Copy just the needed macro definitions from the kernel's (private) hvcall.h file and remove the extra tricks formerly used to be able to include this header file directly. Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx> --- Hi, this version of the header file just contains the definitions we need, while still being easily diff-able against the original file. Please consider applying this one. Cheers, Andre. powerpc/include/asm/hvcall.h | 33 +++++++++++++++++++++++++++++++++ powerpc/spapr.h | 3 --- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 powerpc/include/asm/hvcall.h diff --git a/powerpc/include/asm/hvcall.h b/powerpc/include/asm/hvcall.h new file mode 100644 index 0000000..9d58f9b --- /dev/null +++ b/powerpc/include/asm/hvcall.h @@ -0,0 +1,33 @@ +#ifndef _ASM_POWERPC_HVCALL_H +#define _ASM_POWERPC_HVCALL_H + +/* This file is a trimmed-down version of arch/powerpc/include/asm/hvcall.h. */ + +#define H_SUCCESS 0 + +#define H_HARDWARE -1 /* Hardware error */ +#define H_FUNCTION -2 /* Function not supported */ +#define H_PRIVILEGE -3 /* Caller not privileged */ +#define H_PARAMETER -4 /* Parameter invalid, out-of-range or conflicting */ + +#define H_SET_DABR 0x28 +#define H_LOGICAL_CI_LOAD 0x3c +#define H_LOGICAL_CI_STORE 0x40 +#define H_LOGICAL_CACHE_LOAD 0x44 +#define H_LOGICAL_CACHE_STORE 0x48 +#define H_LOGICAL_ICBI 0x4c +#define H_LOGICAL_DCBF 0x50 + +#define H_GET_TERM_CHAR 0x54 +#define H_PUT_TERM_CHAR 0x58 + +#define H_EOI 0x64 +#define H_CPPR 0x68 +#define H_IPI 0x6c +#define H_IPOLL 0x70 +#define H_XIRR 0x74 + +#define H_SET_MODE 0x31C +#define MAX_HCALL_OPCODE H_SET_MODE + +#endif /* _ASM_POWERPC_HVCALL_H */ diff --git a/powerpc/spapr.h b/powerpc/spapr.h index 0537f88..4c6e349 100644 --- a/powerpc/spapr.h +++ b/powerpc/spapr.h @@ -16,10 +16,7 @@ #include <inttypes.h> -/* We need some of the H_ hcall defs, but they're __KERNEL__ only. */ -#define __KERNEL__ #include <asm/hvcall.h> -#undef __KERNEL__ #include "kvm/kvm.h" #include "kvm/kvm-cpu.h" -- 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
