Pull powerpc fixes from Michael Ellerman: "Fix a kernel crash in spufs_create_root() on Cell machines, since the new mount API went in. Fix a regression in our KVM code caused by our recent PCR changes. Avoid a warning message about a failing hypervisor API on systems that don't have that API. A couple of minor build fixes. Thanks to: Alexey Kardashevskiy, Alistair Popple, Desnes A. Nunes do Rosario, Emmanuel Nicolet, Jordan Niethe, Laurent Dufour, Stephen Rothwell" * tag 'powerpc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: spufs: fix a crash in spufs_create_root() powerpc/kvm: Fix kvmppc_vcore->in_guest value in kvmhv_switch_to_host selftests/powerpc: Fix compile error on tlbie_test due to newer gcc powerpc/pseries: Remove confusing warning message. powerpc/64s/radix: Fix build failure with RADIX_MMU=n
Unified · Split
| @@ -35,6 +35,10 @@ static inline void radix__flush_all_lpid(unsigned int lpid) · 34 unmodified lines | |||
| 35 | { | 35 | { |
| 36 | WARN_ON(1); | 36 | WARN_ON(1); |
| 37 | } | 37 | } |
| 38 | static inline void radix__flush_all_lpid_guest(unsigned int lpid) | ||
| 39 | { | ||
| 40 | WARN_ON(1); | ||
| 41 | } | ||
| 38 | #endif | 42 | #endif |
| 39 | 43 | ||
| 40 | extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma, | 44 | extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma, |
| @@ -1921,6 +1921,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) · 1920 unmodified lines | |||
| 1921 | mtspr SPRN_PCR, r6 | 1921 | mtspr SPRN_PCR, r6 |
| 1922 | 18: | 1922 | 18: |
| 1923 | /* Signal secondary CPUs to continue */ | 1923 | /* Signal secondary CPUs to continue */ |
| 1924 | li r0, 0 | ||
| 1924 | stb r0,VCORE_IN_GUEST(r5) | 1925 | stb r0,VCORE_IN_GUEST(r5) |
| 1925 | 19: lis r8,0x7fff /* MAX_INT@h */ | 1926 | 19: lis r8,0x7fff /* MAX_INT@h */ |
| 1926 | mtspr SPRN_HDEC,r8 | 1927 | mtspr SPRN_HDEC,r8 |
| @@ -761,6 +761,7 @@ static int spufs_init_fs_context(struct fs_context *fc) · 760 unmodified lines | |||
| 761 | ctx->gid = current_gid(); | 761 | ctx->gid = current_gid(); |
| 762 | ctx->mode = 0755; | 762 | ctx->mode = 0755; |
| 763 | 763 | ||
| 764 | fc->fs_private = ctx; | ||
| 764 | fc->s_fs_info = sbi; | 765 | fc->s_fs_info = sbi; |
| 765 | fc->ops = &spufs_context_ops; | 766 | fc->ops = &spufs_context_ops; |
| 766 | return 0; | 767 | return 0; |
| @@ -1419,6 +1419,9 @@ void __init pseries_lpar_read_hblkrm_characteristics(void) · 1418 unmodified lines | |||
| 1419 | unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH]; | 1419 | unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH]; |
| 1420 | int call_status, len, idx, bpsize; | 1420 | int call_status, len, idx, bpsize; |
| 1421 | 1421 | ||
| 1422 | if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE)) | ||
| 1423 | return; | ||
| 1424 | |||
| 1422 | spin_lock(&rtas_data_buf_lock); | 1425 | spin_lock(&rtas_data_buf_lock); |
| 1423 | memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE); | 1426 | memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE); |
| 1424 | call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1, | 1427 | call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1, |
| @@ -636,7 +636,7 @@ int main(int argc, char *argv[]) · 635 unmodified lines | |||
| 636 | nrthreads = strtoul(optarg, NULL, 10); | 636 | nrthreads = strtoul(optarg, NULL, 10); |
| 637 | break; | 637 | break; |
| 638 | case 'l': | 638 | case 'l': |
| 639 | strncpy(logdir, optarg, LOGDIR_NAME_SIZE); | 639 | strncpy(logdir, optarg, LOGDIR_NAME_SIZE - 1); |
| 640 | break; | 640 | break; |
| 641 | case 't': | 641 | case 't': |
| 642 | run_time = strtoul(optarg, NULL, 10); | 642 | run_time = strtoul(optarg, NULL, 10); |