From patchwork Sun Jun 10 19:24:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Collins X-Patchwork-Id: 164259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 452E2B6FD7 for ; Tue, 12 Jun 2012 09:01:03 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SeDbQ-0003BI-8y; Mon, 11 Jun 2012 23:00:52 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SeDbN-00037q-9Z for kernel-team@lists.ubuntu.com; Mon, 11 Jun 2012 23:00:49 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq13so6560948pbb.8 for ; Mon, 11 Jun 2012 16:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:in-reply-to:references:from:date:subject:to; bh=kiWe6xbhSUNvhrg6OxHGnq0YjuYiRQNCyXFtSp0ndS8=; b=xw+kU41NiAJyCaLkDPDr85DhEOGzgCB66dkV2z3Xb7mTkE858a0Wop8O4y90CRH9y8 isGdtGHf9fygptrSBV2t+TNMsxL8MwiMnsCJTMLXItHX240m8Cc/+VQH4kG/+vRCQQtC 9MTSPfS2Qw1auCIgaZbW/2o4CVUvWyKMXX791+R/tyndAoU+x+/vB08hAmfS8UKZffaY p79iHl9kCENc1lKJh3MXEtUuhdXucsV5mZ2tvyCSnPUI5SWD/Kcn/ILc0Tu/T+8d8blB JyHBYffcEvZbPn8tiZPuuDXov/AXUkVP4OV1+gKTg62K4Af3O14UkKKii7+eJxCmVHCy QojQ== Received: by 10.68.138.166 with SMTP id qr6mr31572290pbb.43.1339455648822; Mon, 11 Jun 2012 16:00:48 -0700 (PDT) Received: from localhost (ip68-13-200-36.hr.hr.cox.net. [68.13.200.36]) by mx.google.com with ESMTPS id kt1sm19932135pbc.32.2012.06.11.16.00.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 16:00:47 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 11 Jun 2012 19:00:43 -0400 Message-Id: <2c0ac945898aace7a279062ee0f68e0beda3b347.1339455421.git.bcollins@ubuntu.com> In-Reply-To: References: From: Ben Collins Date: Sun, 10 Jun 2012 15:24:10 -0400 Subject: [PATCH 01/27] UBUNTU: [Upstream] EDAC: Fix compilation of mpc85xx_edac driver To: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sent upstream to EDAC mailing list. Signed-off-by: Ben Collins --- drivers/edac/mpc85xx_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 4c40235..40a8c87 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -980,7 +980,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) layers[1].type = EDAC_MC_LAYER_CHANNEL; layers[1].size = 1; layers[1].is_virt_csrow = false; - mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), sizeof(*pdata)); + mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers, sizeof(*pdata)); if (!mci) { devres_release_group(&op->dev, mpc85xx_mc_err_probe); return -ENOMEM;