From patchwork Thu Oct 30 23:04:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 405142 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D040714007F for ; Fri, 31 Oct 2014 10:05:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161465AbaJ3XF1 (ORCPT ); Thu, 30 Oct 2014 19:05:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52613 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422692AbaJ3XFW (ORCPT ); Thu, 30 Oct 2014 19:05:22 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6A8DFADAC; Thu, 30 Oct 2014 23:05:17 +0000 (UTC) Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.83) (envelope-from ) id 1XjymL-0006on-03; Fri, 31 Oct 2014 00:05:17 +0100 From: Jiri Slaby To: stable@vger.kernel.org Cc: Dave Kleikamp , Bob Picco , "David S. Miller" , sparclinux@vger.kernel.org Subject: [patch added to the 3.12 stable tree] sparc64: Increase size of boot string to 1024 bytes Date: Fri, 31 Oct 2014 00:04:22 +0100 Message-Id: <1414710316-25911-36-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1414710316-25911-1-git-send-email-jslaby@suse.cz> References: <1414710316-25911-1-git-send-email-jslaby@suse.cz> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Dave Kleikamp This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== [ Upstream commit 1cef94c36bd4d79b5ae3a3df99ee0d76d6a4a6dc ] This is the longest boot string that silo supports. Signed-off-by: Dave Kleikamp Cc: Bob Picco Cc: David S. Miller Cc: sparclinux@vger.kernel.org Signed-off-by: David S. Miller --- arch/sparc/prom/bootstr_64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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;