diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:23:54 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:23:54 +1000 |
| commit | 481c63acba2559139d0b46db0d83caca05c3cf63 (patch) | |
| tree | 5b06dbb2a769d6b49a5b2d053383f0f842146b77 /arch/powerpc/platforms | |
| parent | 667416f38554eef94485496f3a27b93feb5a9fbb (diff) | |
| parent | eacbb218fbbab5923775059f7232a9622dc47b2a (diff) | |
| download | op-kernel-dev-481c63acba2559139d0b46db0d83caca05c3cf63.zip op-kernel-dev-481c63acba2559139d0b46db0d83caca05c3cf63.tar.gz | |
Merge branch 'topic/ppc-kvm' into next
Merge in some commits we're sharing with the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/copy-paste.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/copy-paste.h b/arch/powerpc/platforms/powernv/copy-paste.h index c9a5036..3fa62de 100644 --- a/arch/powerpc/platforms/powernv/copy-paste.h +++ b/arch/powerpc/platforms/powernv/copy-paste.h @@ -7,9 +7,8 @@ * 2 of the License, or (at your option) any later version. */ #include <asm/ppc-opcode.h> +#include <asm/reg.h> -#define CR0_SHIFT 28 -#define CR0_MASK 0xF /* * Copy/paste instructions: * |
