Commit 518af3cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS fixes from Ralf Baechle:
 "Seven small fixes.  The shortlog below is a good description so no
  need to elaborate.

  It has sat in linux-next and survived the usual automated testing by
  Imagination's test farm"

* 'master' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: tlb-r4k: Fix PG_ELPA comment
  MIPS: Fix up obsolete cpu_set usage
  MIPS: IP32: Fix build errors in reset code in DS1685 platform hook.
  MIPS: KVM: Fix unused variable build warning
  MIPS: traps: remove extra Tainted: line from __show_regs() output
  MIPS: Fix wrong CHECKFLAGS (sparse builds) with GCC 5.1
  MIPS: Fix a preemption issue with thread's FPU defaults
parents 2ed3d795 e05cb568

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ LDFLAGS += -m $(ld-emul) 
ifdef CONFIG_MIPS

CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \

	egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \

	sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/")

	sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')

ifdef CONFIG_64BIT

CHECKFLAGS		+= -m64

endif

arch/mips/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ do { \ 
									\

	current->thread.abi = &mips_abi;				\

									\

	current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31;		\

	current->thread.fpu.fcr31 = boot_cpu_data.fpu_csr31;		\

} while (0)



#endif /* CONFIG_32BIT */
@@ -366,7 +366,7 @@ do { \ 
	else								\

		current->thread.abi = &mips_abi;			\

									\

	current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31;		\

	current->thread.fpu.fcr31 = boot_cpu_data.fpu_csr31;		\

									\

	p = personality(current->personality);				\

	if (p != PER_LINUX32 && p != PER_LINUX)				\

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data) 


	__get_user(value, data + 64);

	fcr31 = child->thread.fpu.fcr31;

	mask = current_cpu_data.fpu_msk31;

	mask = boot_cpu_data.fpu_msk31;

	child->thread.fpu.fcr31 = (value & ~mask) | (fcr31 & mask);



	/* FIR may not be written.  */

arch/mips/kernel/smp-cps.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void __init cps_smp_setup(void) 
#ifdef CONFIG_MIPS_MT_FPAFF

	/* If we have an FPU, enroll ourselves in the FPU-full mask */

	if (cpu_has_fpu)

		cpu_set(0, mt_fpu_cpumask);

		cpumask_set_cpu(0, &mt_fpu_cpumask);

#endif /* CONFIG_MIPS_MT_FPAFF */

}

arch/mips/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static void __show_regs(const struct pt_regs *regs) 
	 */

	printk("epc   : %0*lx %pS\n", field, regs->cp0_epc,

	       (void *) regs->cp0_epc);

	printk("    %s\n", print_tainted());

	printk("ra    : %0*lx %pS\n", field, regs->regs[31],

	       (void *) regs->regs[31]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE