diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2016-11-24 09:22:28 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2016-11-24 09:22:28 +1100 |
| commit | bc33b1fc83c0ecfcfcbb3c36fbaf7aec8bba6518 (patch) | |
| tree | 783097be3a1853ce1a1a8b056e9400837b4f4b22 /arch/powerpc/kernel | |
| parent | 68b8b72bb221f6d3d14b7fcc9c6991121b6a06ba (diff) | |
| parent | 02ed21aeda0e02d84af493f92b1b6b6b13ddd6e8 (diff) | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the ppc-kvm topic branch to get changes to
arch/powerpc code that are necessary for adding POWER9 KVM support.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_power.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S index 52ff3f025437..bdfc1c67eb38 100644 --- a/arch/powerpc/kernel/cpu_setup_power.S +++ b/arch/powerpc/kernel/cpu_setup_power.S @@ -174,7 +174,7 @@ __init_FSCR: __init_HFSCR: mfspr r3,SPRN_HFSCR ori r3,r3,HFSCR_TAR|HFSCR_TM|HFSCR_BHRB|HFSCR_PM|\ - HFSCR_DSCR|HFSCR_VECVSX|HFSCR_FP|HFSCR_EBB + HFSCR_DSCR|HFSCR_VECVSX|HFSCR_FP|HFSCR_EBB|HFSCR_MSGP mtspr SPRN_HFSCR,r3 blr |