From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoffer Dall <christoffer.dall@linaro.org>
Subject: Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash
Date: Wed, 11 Sep 2013 18:50:02 -0700
Message-ID: <20130912015002.GO9860@cbox>
References: <1378938461-10835-1-git-send-email-olof@lixom.net>
 <CAOesGMjum0TSyudXiZtXHOGX4R7dBAhjUpoYnwjTcfD1MMpTxw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	Ian Campbell <ijc@hellion.org.uk>
To: Olof Johansson <olof@lixom.net>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-pb0-f43.google.com ([209.85.160.43]:37445 "EHLO
	mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751635Ab3ILBt6 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 11 Sep 2013 21:49:58 -0400
Received: by mail-pb0-f43.google.com with SMTP id md4so9840282pbc.2
        for <kvm@vger.kernel.org>; Wed, 11 Sep 2013 18:49:58 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <CAOesGMjum0TSyudXiZtXHOGX4R7dBAhjUpoYnwjTcfD1MMpTxw@mail.gmail.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
> > so it expands here and causes problems.
> >
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
> 
> Cc: <stable@vger.kernel.org> # 3.10+
> 
Thanks for the fix, applied.

-Christoffer