powerpc fixes for 5.4 #3
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. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEJFGtCPCthwEv2Y/bUevqPMjhpYAFAl2hq8ETHG1wZUBlbGxl cm1hbi5pZC5hdQAKCRBR6+o8yOGlgHouD/4nfAtKfhYJSo84dsCKeneRD6uLyJXI SdWqVMneJn8uZU53aRg2CjO97cD3dKi1V/ZpMJnf2zJCUZ2fWytkTnXNHUPx8n/r W5YRyGFENuwVF7UfjBRgJ1mczRa/vNkQK4YmumZ7commjoGroVxorfecy+re3B+6 xGFJA3SGvvMYB3v1KzOsJ+ymrRAt3uNLOcbwkBfRWvptY4MtYGcPpuv8TtsSzRXB sfjDUTLNIvl+yH/hm5Tvh04yNLLU/SJKaptKMzc/L4dFRSlqzWDXfUMui8ePLZTy crh9ckNa+tcKzNG9SUbuLKE1nHSB0x1nsQYzdnG7T10AR5rDmcQi9Q+Pz87WiT59 pdTebV6AS71RbOpBuAKUOX3XZuhi7NozmExSwDqNU6PCb/zqTdAWe1dQAitcwrUE g9TNwfluihdHJ/cojE7jylPEkJI3VNguJHLRZzLBv/+X8CQ03X8oKJJJiS5xYRuv RgA8p+oc7Hsl6h32tcLYJ22IaJ0dNZde+/oV+WxYAT0IE0r1ZaYfhtRgGrXVJDwC Ev2m55UyqfRTSEAszzT3du+GCAwdLqEPPBGR+Xavb+5SgEupqzn23RTa7Orkagtc l89ImHXKjB5eI6gZZ5a57gDj320Kdxd6LhrxEoxP+RnRveEF4hNS0B+MwLtmt9L4 OH6FrWrGKbqIIg== =jRp0 -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
db60a5a035
|
@ -35,6 +35,10 @@ static inline void radix__flush_all_lpid(unsigned int lpid)
|
||||||
{
|
{
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
}
|
}
|
||||||
|
static inline void radix__flush_all_lpid_guest(unsigned int lpid)
|
||||||
|
{
|
||||||
|
WARN_ON(1);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma,
|
extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma,
|
||||||
|
|
|
@ -1921,6 +1921,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
|
||||||
mtspr SPRN_PCR, r6
|
mtspr SPRN_PCR, r6
|
||||||
18:
|
18:
|
||||||
/* Signal secondary CPUs to continue */
|
/* Signal secondary CPUs to continue */
|
||||||
|
li r0, 0
|
||||||
stb r0,VCORE_IN_GUEST(r5)
|
stb r0,VCORE_IN_GUEST(r5)
|
||||||
19: lis r8,0x7fff /* MAX_INT@h */
|
19: lis r8,0x7fff /* MAX_INT@h */
|
||||||
mtspr SPRN_HDEC,r8
|
mtspr SPRN_HDEC,r8
|
||||||
|
|
|
@ -761,6 +761,7 @@ static int spufs_init_fs_context(struct fs_context *fc)
|
||||||
ctx->gid = current_gid();
|
ctx->gid = current_gid();
|
||||||
ctx->mode = 0755;
|
ctx->mode = 0755;
|
||||||
|
|
||||||
|
fc->fs_private = ctx;
|
||||||
fc->s_fs_info = sbi;
|
fc->s_fs_info = sbi;
|
||||||
fc->ops = &spufs_context_ops;
|
fc->ops = &spufs_context_ops;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -1419,6 +1419,9 @@ void __init pseries_lpar_read_hblkrm_characteristics(void)
|
||||||
unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];
|
unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];
|
||||||
int call_status, len, idx, bpsize;
|
int call_status, len, idx, bpsize;
|
||||||
|
|
||||||
|
if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE))
|
||||||
|
return;
|
||||||
|
|
||||||
spin_lock(&rtas_data_buf_lock);
|
spin_lock(&rtas_data_buf_lock);
|
||||||
memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);
|
memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);
|
||||||
call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,
|
call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,
|
||||||
|
|
|
@ -636,7 +636,7 @@ int main(int argc, char *argv[])
|
||||||
nrthreads = strtoul(optarg, NULL, 10);
|
nrthreads = strtoul(optarg, NULL, 10);
|
||||||
break;
|
break;
|
||||||
case 'l':
|
case 'l':
|
||||||
strncpy(logdir, optarg, LOGDIR_NAME_SIZE);
|
strncpy(logdir, optarg, LOGDIR_NAME_SIZE - 1);
|
||||||
break;
|
break;
|
||||||
case 't':
|
case 't':
|
||||||
run_time = strtoul(optarg, NULL, 10);
|
run_time = strtoul(optarg, NULL, 10);
|
||||||
|
|
Loading…
Reference in New Issue