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

Commit 86a7b7ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents bbbb45a0 4e7c81af

arch/mips/kernel/syscall.c

+4 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, 


	if (cpu_has_llsc && R10000_LLSC_WAR) {

		__asm__ __volatile__ (

		"	.set	mips3					\n"

		"	li	%[err], 0				\n"

		"1:	ll	%[old], (%[addr])			\n"

		"	move	%[tmp], %[new]				\n"
@@ -320,6 +321,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, 
		"	"STR(PTR)"	1b, 4b				\n"

		"	"STR(PTR)"	2b, 4b				\n"

		"	.previous					\n"

		"	.set	mips0					\n"

		: [old] "=&r" (old),

		  [err] "=&r" (err),

		  [tmp] "=&r" (tmp)
@@ -329,6 +331,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, 
		: "memory");

	} else if (cpu_has_llsc) {

		__asm__ __volatile__ (

		"	.set	mips3					\n"

		"	li	%[err], 0				\n"

		"1:	ll	%[old], (%[addr])			\n"

		"	move	%[tmp], %[new]				\n"
@@ -347,6 +350,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, 
		"	"STR(PTR)"	1b, 5b				\n"

		"	"STR(PTR)"	2b, 5b				\n"

		"	.previous					\n"

		"	.set	mips0					\n"

		: [old] "=&r" (old),

		  [err] "=&r" (err),

		  [tmp] "=&r" (tmp)

arch/mips/rb532/devices.c

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static struct korina_device korina_dev0_data = { 
static struct platform_device korina_dev0 = {

	.id = -1,

	.name = "korina",

	.dev.driver_data = &korina_dev0_data,

	.resource = korina_dev0_res,

	.num_resources = ARRAY_SIZE(korina_dev0_res),

};
@@ -332,6 +331,8 @@ static int __init plat_setup_devices(void) 
	/* set the uart clock to the current cpu frequency */

	rb532_uart_res[0].uartclk = idt_cpu_freq;



	dev_set_drvdata(&korina_dev0.dev, &korina_dev0_data);



	return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));

}