Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 866e6441 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS updates from Ralf Baechle:
 "Eight fixes across arch/mips.  Nothing stands particuarly out nor is
  complicated but fixes keep coming in at a higher than comfortable
  rate"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: KVM: Do not sign extend on unsigned MMIO load
  MIPS: BPF: Fix stack pointer allocation
  MIPS: Loongson-3: Fix a cpu-hotplug issue in loongson3_ipi_interrupt()
  MIPS: Fix enabling of DEBUG_STACKOVERFLOW
  MIPS: c-r4k: Fix typo in probe_scache()
  MIPS: Avoid an FPE exception in FCSR mask probing
  MIPS: ath79: Add a missing new line in log message
  MIPS: ralink: Fix clearing the illegal access interrupt
parents 37ef1647 ed9244e6

arch/mips/ath79/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ void __init plat_time_init(void) 
	ddr_clk_rate = ath79_get_sys_clk_rate("ddr");

	ref_clk_rate = ath79_get_sys_clk_rate("ref");



	pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz",

	pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz\n",

		cpu_clk_rate / 1000000, (cpu_clk_rate / 1000) % 1000,

		ddr_clk_rate / 1000000, (ddr_clk_rate / 1000) % 1000,

		ahb_clk_rate / 1000000, (ahb_clk_rate / 1000) % 1000,

arch/mips/kernel/cpu-probe.c

+1 −2
Original line number Diff line number Diff line
@@ -74,13 +74,12 @@ static inline void cpu_set_fpu_fcsr_mask(struct cpuinfo_mips *c) 
{

	unsigned long sr, mask, fcsr, fcsr0, fcsr1;



	fcsr = c->fpu_csr31;

	mask = FPU_CSR_ALL_X | FPU_CSR_ALL_E | FPU_CSR_ALL_S | FPU_CSR_RM;



	sr = read_c0_status();

	__enable_fpu(FPU_AS_IS);



	fcsr = read_32bit_cp1_register(CP1_STATUS);



	fcsr0 = fcsr & mask;

	write_32bit_cp1_register(CP1_STATUS, fcsr0);

	fcsr0 = read_32bit_cp1_register(CP1_STATUS);

arch/mips/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void __init init_IRQ(void) 
#endif

}



#ifdef DEBUG_STACKOVERFLOW

#ifdef CONFIG_DEBUG_STACKOVERFLOW

static inline void check_stack_overflow(void)

{

	unsigned long sp;

arch/mips/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -2409,7 +2409,7 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, 
		if (vcpu->mmio_needed == 2)

			*gpr = *(int16_t *) run->mmio.data;

		else

			*gpr = *(int16_t *) run->mmio.data;

			*gpr = *(uint16_t *)run->mmio.data;



		break;

	case 1:

arch/mips/loongson/loongson-3/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void loongson3_ipi_interrupt(struct pt_regs *regs) 
	if (action & SMP_ASK_C0COUNT) {

		BUG_ON(cpu != 0);

		c0count = read_c0_count();

		for (i = 1; i < loongson_sysconf.nr_cpus; i++)

		for (i = 1; i < num_possible_cpus(); i++)

			per_cpu(core0_c0count, i) = c0count;

	}

}