Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: RB532: Fix devices.c compilation.
MIPS: Fix MIPS I build.
+6
-1
+4
arch/mips/kernel/syscall.c
+4
arch/mips/kernel/syscall.c
···
306
306
307
307
if (cpu_has_llsc && R10000_LLSC_WAR) {
308
308
__asm__ __volatile__ (
309
+
" .set mips3 \n"
309
310
" li %[err], 0 \n"
310
311
"1: ll %[old], (%[addr]) \n"
311
312
" move %[tmp], %[new] \n"
···
321
320
" "STR(PTR)" 1b, 4b \n"
322
321
" "STR(PTR)" 2b, 4b \n"
323
322
" .previous \n"
323
+
" .set mips0 \n"
324
324
: [old] "=&r" (old),
325
325
[err] "=&r" (err),
326
326
[tmp] "=&r" (tmp)
···
331
329
: "memory");
332
330
} else if (cpu_has_llsc) {
333
331
__asm__ __volatile__ (
332
+
" .set mips3 \n"
334
333
" li %[err], 0 \n"
335
334
"1: ll %[old], (%[addr]) \n"
336
335
" move %[tmp], %[new] \n"
···
350
347
" "STR(PTR)" 1b, 5b \n"
351
348
" "STR(PTR)" 2b, 5b \n"
352
349
" .previous \n"
350
+
" .set mips0 \n"
353
351
: [old] "=&r" (old),
354
352
[err] "=&r" (err),
355
353
[tmp] "=&r" (tmp)
+2
-1
arch/mips/rb532/devices.c
+2
-1
arch/mips/rb532/devices.c
···
110
110
static struct platform_device korina_dev0 = {
111
111
.id = -1,
112
112
.name = "korina",
113
-
.dev.driver_data = &korina_dev0_data,
114
113
.resource = korina_dev0_res,
115
114
.num_resources = ARRAY_SIZE(korina_dev0_res),
116
115
};
···
330
331
331
332
/* set the uart clock to the current cpu frequency */
332
333
rb532_uart_res[0].uartclk = idt_cpu_freq;
334
+
335
+
dev_set_drvdata(&korina_dev0.dev, &korina_dev0_data);
333
336
334
337
return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));
335
338
}