Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-17
+1
-1
arch/mips/Makefile
+1
-1
arch/mips/Makefile
···
277
277
ifdef CONFIG_MIPS
278
278
CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \
279
279
egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \
280
-
sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/")
280
+
sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')
281
281
ifdef CONFIG_64BIT
282
282
CHECKFLAGS += -m64
283
283
endif
+2
-2
arch/mips/include/asm/elf.h
+2
-2
arch/mips/include/asm/elf.h
···
304
304
\
305
305
current->thread.abi = &mips_abi; \
306
306
\
307
-
current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31; \
307
+
current->thread.fpu.fcr31 = boot_cpu_data.fpu_csr31; \
308
308
} while (0)
309
309
310
310
#endif /* CONFIG_32BIT */
···
366
366
else \
367
367
current->thread.abi = &mips_abi; \
368
368
\
369
-
current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31; \
369
+
current->thread.fpu.fcr31 = boot_cpu_data.fpu_csr31; \
370
370
\
371
371
p = personality(current->personality); \
372
372
if (p != PER_LINUX32 && p != PER_LINUX) \
+1
-1
arch/mips/kernel/ptrace.c
+1
-1
arch/mips/kernel/ptrace.c
+1
-1
arch/mips/kernel/smp-cps.c
+1
-1
arch/mips/kernel/smp-cps.c
-1
arch/mips/kernel/traps.c
-1
arch/mips/kernel/traps.c
-6
arch/mips/kvm/emulate.c
-6
arch/mips/kvm/emulate.c
···
2389
2389
{
2390
2390
unsigned long *gpr = &vcpu->arch.gprs[vcpu->arch.io_gpr];
2391
2391
enum emulation_result er = EMULATE_DONE;
2392
-
unsigned long curr_pc;
2393
2392
2394
2393
if (run->mmio.len > sizeof(*gpr)) {
2395
2394
kvm_err("Bad MMIO length: %d", run->mmio.len);
···
2396
2397
goto done;
2397
2398
}
2398
2399
2399
-
/*
2400
-
* Update PC and hold onto current PC in case there is
2401
-
* an error and we want to rollback the PC
2402
-
*/
2403
-
curr_pc = vcpu->arch.pc;
2404
2400
er = update_pc(vcpu, vcpu->arch.pending_load_cause);
2405
2401
if (er == EMULATE_FAIL)
2406
2402
return er;
+2
-2
arch/mips/math-emu/cp1emu.c
+2
-2
arch/mips/math-emu/cp1emu.c
···
889
889
break;
890
890
891
891
case FPCREG_RID:
892
-
value = current_cpu_data.fpu_id;
892
+
value = boot_cpu_data.fpu_id;
893
893
break;
894
894
895
895
default:
···
921
921
(void *)xcp->cp0_epc, MIPSInst_RT(ir), value);
922
922
923
923
/* Preserve read-only bits. */
924
-
mask = current_cpu_data.fpu_msk31;
924
+
mask = boot_cpu_data.fpu_msk31;
925
925
fcr31 = (value & ~mask) | (fcr31 & mask);
926
926
break;
927
927
+1
-1
arch/mips/mm/tlb-r4k.c
+1
-1
arch/mips/mm/tlb-r4k.c
+2
-2
arch/mips/sgi-ip32/ip32-platform.c
+2
-2
arch/mips/sgi-ip32/ip32-platform.c
···
130
130
.resource = ip32_rtc_resources,
131
131
};
132
132
133
-
+static int __init sgio2_rtc_devinit(void)
133
+
static __init int sgio2_rtc_devinit(void)
134
134
{
135
135
return platform_device_register(&ip32_rtc_device);
136
136
}
137
137
138
-
device_initcall(sgio2_cmos_devinit);
138
+
device_initcall(sgio2_rtc_devinit);