Commit bbc6089c authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch, to bring in the fixes for the KVM PCR bug and
the spufs crash.
parents a9336ddf 2272905a

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

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ static inline void radix__flush_all_lpid(unsigned int lpid) 
{

	WARN_ON(1);

}

static inline void radix__flush_all_lpid_guest(unsigned int lpid)

{

	WARN_ON(1);

}

#endif



extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma,

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+1 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) 
	mtspr	SPRN_PCR, r6

18:

	/* Signal secondary CPUs to continue */

	li	r0, 0

	stb	r0,VCORE_IN_GUEST(r5)

19:	lis	r8,0x7fff		/* MAX_INT@h */

	mtspr	SPRN_HDEC,r8

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

+1 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ static int spufs_init_fs_context(struct fs_context *fc) 
	ctx->gid = current_gid();

	ctx->mode = 0755;



	fc->fs_private = ctx;

	fc->s_fs_info = sbi;

	fc->ops = &spufs_context_ops;

	return 0;

arch/powerpc/platforms/pseries/lpar.c

+3 −0
Original line number Diff line number Diff line
@@ -1419,6 +1419,9 @@ void __init pseries_lpar_read_hblkrm_characteristics(void) 
	unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];

	int call_status, len, idx, bpsize;



	if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE))

		return;



	spin_lock(&rtas_data_buf_lock);

	memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);

	call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,

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

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ int main(int argc, char *argv[]) 
			nrthreads = strtoul(optarg, NULL, 10);

			break;

		case 'l':

			strncpy(logdir, optarg, LOGDIR_NAME_SIZE);

			strncpy(logdir, optarg, LOGDIR_NAME_SIZE - 1);

			break;

		case 't':

			run_time = strtoul(optarg, NULL, 10);

CRA Git | Maintained and supported by SUSTech CRA and CCSE