From patchwork Fri Oct 31 20:53:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 405584 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 03C61140145 for ; Sat, 1 Nov 2014 07:53:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759755AbaJaUxh (ORCPT ); Fri, 31 Oct 2014 16:53:37 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49999 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759729AbaJaUxh (ORCPT ); Fri, 31 Oct 2014 16:53:37 -0400 Received: from c-76-102-4-12.hsd1.ca.comcast.net ([76.102.4.12] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XkJCQ-0000Oj-EM; Fri, 31 Oct 2014 20:53:34 +0000 Received: from kamal by fourier with local (Exim 4.82) (envelope-from ) id 1XkJCO-0002US-Ms; Fri, 31 Oct 2014 13:53:32 -0700 From: Kamal Mostafa To: Dave Kleikamp Cc: Bob Picco , "David S. Miller" , sparclinux@vger.kernel.org, Kamal Mostafa , kernel-team@lists.ubuntu.com Subject: [3.13.y.z extended stable] Patch "sparc64: Increase size of boot string to 1024 bytes" has been added to staging queue Date: Fri, 31 Oct 2014 13:53:32 -0700 Message-Id: <1414788812-9541-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 X-Extended-Stable: 3.13 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org This is a note to let you know that I have just added a patch titled sparc64: Increase size of boot string to 1024 bytes to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue This patch is scheduled to be released in version 3.13.11.11. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.13.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 07ddd13795fdf9df079583c3f5c7051f4453b2ae Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Tue, 7 Oct 2014 08:12:37 -0500 Subject: 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 Cc: Bob Picco Cc: David S. Miller Cc: sparclinux@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Kamal Mostafa --- arch/sparc/prom/bootstr_64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/prom/bootstr_64.c b/arch/sparc/prom/bootstr_64.c index ab9ccc6..7149e77 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;