Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6 (bcc408b7) · Commits · e / devices / android_kernel_xiaomi_markw

arch/ppc64/kernel/iommu.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -423,6 +423,9 @@ struct iommu_table iommu_init_table(struct iommu_table tbl)
		tbl->it_largehint = tbl->it_halfpoint;
		spin_lock_init(&tbl->it_lock);

		/* Clear the hardware table in case firmware left allocations in it */
		ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size);

		if (!welcomed) {
		printk(KERN_INFO "IOMMU table initialized, virtual merging %s\n",
		novmerge ? "disabled" : "enabled");

+5 −4

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ static int smp_pSeries_cpu_bootable(unsigned int nr)
		* cpus are assumed to be secondary threads.
		*/
		if (system_state < SYSTEM_RUNNING &&
		cur_cpu_spec->cpu_features & CPU_FTR_SMT &&
		cpu_has_feature(CPU_FTR_SMT) &&
		!smt_enabled_at_boot && nr % 2 != 0)
		return 0;

		@@ -419,7 +419,7 @@ void __init smp_init_pSeries(void)
		#endif

		/* Mark threads which are still spinning in hold loops. */
		if (cur_cpu_spec->cpu_features & CPU_FTR_SMT)
		if (cpu_has_feature(CPU_FTR_SMT)) {
		for_each_present_cpu(i) {
		if (i % 2 == 0)
		/*
		@@ -428,8 +428,9 @@ void __init smp_init_pSeries(void)
		*/
		cpu_set(i, of_spin_map);
		}
		else
		} else {
		of_spin_map = cpu_present_map;
		}

		cpu_clear(boot_cpuid, of_spin_map);

+2 −2

Original line number	Diff line number	Diff line
		@@ -440,7 +440,7 @@ static int rtasd(void *unused)
		goto error;
		}

		printk(KERN_ERR "RTAS daemon started\n");
		printk(KERN_INFO "RTAS daemon started\n");

		DEBUG("will sleep for %d jiffies\n", (HZ*60/rtas_event_scan_rate) / 2);

		@@ -485,7 +485,7 @@ static int __init rtas_init(void)
		/* No RTAS, only warn if we are on a pSeries box */
		if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
		if (systemcfg->platform & PLATFORM_PSERIES)
		printk(KERN_ERR "rtasd: no event-scan on system\n");
		printk(KERN_INFO "rtasd: no event-scan on system\n");
		return 1;
		}