Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752676AbaAIBg5 (ORCPT ); Wed, 8 Jan 2014 20:36:57 -0500 Received: from gate.crashing.org ([63.228.1.57]:41791 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751520AbaAIBgx (ORCPT ); Wed, 8 Jan 2014 20:36:53 -0500 Message-ID: <1389231387.4672.50.camel@pasglop> Subject: Re: [PATCH] powerpc: Fix alignment of secondary cpu spin vars From: Benjamin Herrenschmidt To: Olof Johansson Cc: Michael Ellerman , chzigotzky@xenosoft.de, linuxppc-dev , "linux-kernel@vger.kernel.org" , Anton Blanchard Date: Thu, 09 Jan 2014 12:36:27 +1100 In-Reply-To: <20140108174828.GA16830@quad.lixom.net> References: <1388264507-5100-1-git-send-email-olof@lixom.net> <20140103081219.GA10233@quad.lixom.net> <1389154189.2076.5.camel@concordia> <1389154706.4672.21.camel@pasglop> <20140108174828.GA16830@quad.lixom.net> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2014-01-08 at 09:48 -0800, Olof Johansson wrote: > > /* If it's a display, note it */ > > - memset(type, 0, sizeof(type)); > > - prom_getprop(stdout_node, "device_type", type, sizeof(type)); > > - if (strcmp(type, "display") == 0) > > - prom_setprop(stdout_node, path, "linux,boot-display", NULL, 0); > > + stdout_node = call_prom("instance-to-package", 1, 1, prom.stdout); > > + if (stdout_node != PROM_ERROR) { > > + val = cpu_to_be32(stdout_node); > > + memset(type, 0, sizeof(type)); > > + prom_getprop(stdout_node, "device_type", type, sizeof(type)); > > + if (strcmp(type, "display") == 0) > > + prom_setprop(stdout_node, path, "linux,boot-display", NU > > Line is cut off, this needs "NULL, 0);" at the end. Right, copy/paste failure :-) Thanks, I'll try to get that to Linus before he cuts .13, otherwise it will be -stable. Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/