diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:52:31 -0700 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:52:31 -0700 |
| commit | 0810a1c64f504d9b272196337a7a2e39872b56d8 (patch) | |
| tree | 0b8310deaad1b1a2fba43d3c671a2d30cf5e1fa9 /arch/powerpc/include/uapi | |
| parent | d886b82d2cc23b69aa1cc29a54cc77cf79f430e5 (diff) | |
| parent | b52c9082f2eb3a6f7fbbc86fad3eaa2a1725da66 (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into v4.4/topic/optee
Diffstat (limited to 'arch/powerpc/include/uapi')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/cputable.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/include/uapi/asm/kvm.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/uapi/asm/cputable.h b/arch/powerpc/include/uapi/asm/cputable.h index 43686043e297..2734c005da21 100644 --- a/arch/powerpc/include/uapi/asm/cputable.h +++ b/arch/powerpc/include/uapi/asm/cputable.h @@ -31,6 +31,7 @@ #define PPC_FEATURE_PSERIES_PERFMON_COMPAT \ 0x00000040 +/* Reserved - do not use 0x00000004 */ #define PPC_FEATURE_TRUE_LE 0x00000002 #define PPC_FEATURE_PPC_LE 0x00000001 diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h index ab4d4732c492..720b71a636c8 100644 --- a/arch/powerpc/include/uapi/asm/kvm.h +++ b/arch/powerpc/include/uapi/asm/kvm.h @@ -587,6 +587,7 @@ struct kvm_get_htab_header { #define KVM_REG_PPC_TM_VSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U32 | 0x67) #define KVM_REG_PPC_TM_DSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x68) #define KVM_REG_PPC_TM_TAR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x69) +#define KVM_REG_PPC_TM_XER (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x6a) /* PPC64 eXternal Interrupt Controller Specification */ #define KVM_DEV_XICS_GRP_SOURCES 1 /* 64-bit source attributes */ |