commit 0b936842c86392dad2c880539e824881e5d8ba77
author Linus Torvalds <torvalds@linux-foundation.org> Tue Oct 01 12:57:59 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Oct 01 12:57:59 2013 -0700
tree 95dbb304e8c0e83a0dc733b087f9b9eb8b7d21d4
parent 517bf8fc211d37d3aa005fb35f9ee7f1d35cb860
parent 2bd161a605f1f84a5fc8a4fe8410113a94f79355

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

Pull sparc fix from David Miller:
 "Just a single bug fix to a regression added during some strlcpy()
  conversions"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix buggy strlcpy() conversion in ldom_reboot().

arch/sparc/kernel/ds.c

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 62d6b15..4d9ac84 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -851,7 +851,7 @@
 
 		strcpy(full_boot_str, "boot ");
 		strlcpy(full_boot_str + strlen("boot "), boot_command,
-			sizeof(full_boot_str + strlen("boot ")));
+			sizeof(full_boot_str));
 		len = strlen(full_boot_str);
 
 		if (reboot_data_supported) {