Skip to content

Commit db60a5a

Browse files
committed
Merge tag 'powerpc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
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
2 parents 680b5b3 + 2272905 commit db60a5a

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed

arch/powerpc/include/asm/book3s/64/tlbflush-radix.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ static inline void radix__flush_all_lpid(unsigned int lpid)
3535
{
3636
WARN_ON(1);
3737
}
38+
static inline void radix__flush_all_lpid_guest(unsigned int lpid)
39+
{
40+
WARN_ON(1);
41+
}
3842
#endif
3943

4044
extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma,

arch/powerpc/kvm/book3s_hv_rmhandlers.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,6 +1921,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
19211921
mtspr SPRN_PCR, r6
19221922
18:
19231923
/* Signal secondary CPUs to continue */
1924+
li r0, 0
19241925
stb r0,VCORE_IN_GUEST(r5)
19251926
19: lis r8,0x7fff /* MAX_INT@h */
19261927
mtspr SPRN_HDEC,r8

arch/powerpc/platforms/cell/spufs/inode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,7 @@ static int spufs_init_fs_context(struct fs_context *fc)
761761
ctx->gid = current_gid();
762762
ctx->mode = 0755;
763763

764+
fc->fs_private = ctx;
764765
fc->s_fs_info = sbi;
765766
fc->ops = &spufs_context_ops;
766767
return 0;

arch/powerpc/platforms/pseries/lpar.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,6 +1419,9 @@ void __init pseries_lpar_read_hblkrm_characteristics(void)
14191419
unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];
14201420
int call_status, len, idx, bpsize;
14211421

1422+
if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE))
1423+
return;
1424+
14221425
spin_lock(&rtas_data_buf_lock);
14231426
memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);
14241427
call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,

tools/testing/selftests/powerpc/mm/tlbie_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ int main(int argc, char *argv[])
636636
nrthreads = strtoul(optarg, NULL, 10);
637637
break;
638638
case 'l':
639-
strncpy(logdir, optarg, LOGDIR_NAME_SIZE);
639+
strncpy(logdir, optarg, LOGDIR_NAME_SIZE - 1);
640640
break;
641641
case 't':
642642
run_time = strtoul(optarg, NULL, 10);

0 commit comments

Comments
 (0)