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

Commit 7fc22f45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:
 "sparc changes, including a bug fix for handling exceptions during
  bzero on some sparc64 cpus"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: fix fault handling in NGbzero.S and GENbzero.S
  sparc: use memdup_user_nul in sun4m LED driver
  sparc: Remove redundant tests in boot_flags_init().
parents 50fb55d8 3c7f6221

arch/sparc/kernel/head_64.S

+6 −0
Original line number Diff line number Diff line
@@ -939,3 +939,9 @@ ENTRY(__retl_o1) 
	retl

	 mov	%o1, %o0

ENDPROC(__retl_o1)



ENTRY(__retl_o1_asi)

	wr      %o5, 0x0, %asi

	retl

	 mov    %o1, %o0

ENDPROC(__retl_o1_asi)

arch/sparc/kernel/led.c

+3 −10
Original line number Diff line number Diff line
@@ -70,16 +70,9 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer, 
	if (count > LED_MAX_LENGTH)

		count = LED_MAX_LENGTH;



	buf = kmalloc(sizeof(char) * (count + 1), GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	if (copy_from_user(buf, buffer, count)) {

		kfree(buf);

		return -EFAULT;

	}



	buf[count] = '\0';

	buf = memdup_user_nul(buffer, count);

	if (IS_ERR(buf))

		return PTR_ERR(buf);



	/* work around \n when echo'ing into proc */

	if (buf[count - 1] == '\n')

arch/sparc/kernel/setup_32.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void __init boot_flags_init(char *commands) 
{

	while (*commands) {

		/* Move to the start of the next "argument". */

		while (*commands && *commands == ' ')

		while (*commands == ' ')

			commands++;



		/* Process any command switches, otherwise skip it. */

arch/sparc/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void __init boot_flags_init(char *commands) 
{

	while (*commands) {

		/* Move to the start of the next "argument". */

		while (*commands && *commands == ' ')

		while (*commands == ' ')

			commands++;



		/* Process any command switches, otherwise skip it. */

arch/sparc/lib/GENbzero.S

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
98:	x,y;			\

	.section __ex_table,"a";\

	.align 4;		\

	.word 98b, __retl_o1;	\

	.word 98b, __retl_o1_asi;\

	.text;			\

	.align 4;