summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2014-10-07 08:12:37 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-30 09:43:18 -0700
commit5cf02ef6d07965bb3a5da1298fa72259e3c2ea6a (patch)
treeacf17d966bd6e87ccdcd514aee64b68a489607cf
parent5c51a8b0cd0764d02fde570f274973ec182bc301 (diff)
downloadlinux-stable-5cf02ef6d07965bb3a5da1298fa72259e3c2ea6a.tar.gz
linux-stable-5cf02ef6d07965bb3a5da1298fa72259e3c2ea6a.tar.bz2
linux-stable-5cf02ef6d07965bb3a5da1298fa72259e3c2ea6a.zip
sparc64: Increase size of boot string to 1024 bytes
[ Upstream commit 1cef94c36bd4d79b5ae3a3df99ee0d76d6a4a6dc ] This is the longest boot string that silo supports. Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> Cc: Bob Picco <bob.picco@oracle.com> Cc: David S. Miller <davem@davemloft.net> Cc: sparclinux@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/sparc/prom/bootstr_64.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc/prom/bootstr_64.c b/arch/sparc/prom/bootstr_64.c
index ab9ccc63b388..7149e77714a4 100644
--- a/arch/sparc/prom/bootstr_64.c
+++ b/arch/sparc/prom/bootstr_64.c
@@ -14,7 +14,10 @@
* the .bss section or it will break things.
*/
-#define BARG_LEN 256
+/* We limit BARG_LEN to 1024 because this is the size of the
+ * 'barg_out' command line buffer in the SILO bootloader.
+ */
+#define BARG_LEN 1024
struct {
int bootstr_len;
int bootstr_valid;