From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QDCyD-0005P5-CC for qemu-devel@nongnu.org; Fri, 22 Apr 2011 05:48:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QDCyB-00011I-RM for qemu-devel@nongnu.org; Fri, 22 Apr 2011 05:48:13 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:40638) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QDCyB-00011D-Oz for qemu-devel@nongnu.org; Fri, 22 Apr 2011 05:48:11 -0400 Received: by vws17 with SMTP id 17so439588vws.4 for ; Fri, 22 Apr 2011 02:48:10 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <201104221723.55529.bradh@frogmouth.net> References: <1303401708-5419-1-git-send-email-peter.maydell@linaro.org> <201104221723.55529.bradh@frogmouth.net> Date: Fri, 22 Apr 2011 10:48:09 +0100 Message-ID: From: Peter Maydell Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH] target-arm: Minimal implementation of performance counters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Brad Hards Cc: qemu-devel@nongnu.org On 22 April 2011 08:23, Brad Hards wrote: > On Friday 22 April 2011 02:01:48 Peter Maydell wrote: >> Newer Linux kernels assume the existence of the performance counter >> cp15 registers. Provide a minimal implementation of these registers. >> We support no events. This should be compliant with the ARM ARM, >> except that we don't implement the cycle counter. > I tried to apply this to git master, and got a reject (attached). It looks > like that area of target-arm/helper.c hasn't been touched in a while. Is it > possible you have other changes for this? Did I miss a pre-requisite? Works for me: $ git pull Already up-to-date. $ git log --oneline -1 ec44445 target-arm: Set Invalid flag for NaN in float-to-int conversions $ wget -O perfcounters.patch http://patchwork.ozlabs.org/patch/92423/mbox/ $ git am perfcounters.patch Applying: target-arm: Minimal implementation of performance counters $ Looking at your .rej file it seems to have lost the hardcoded tab characters[*] that are in the patch; I suspect something in your mailer is turning them back into spaces. Try downloading the patch from patchwork instead. [*] the tab-indents are in the existing code, the patch is removing them for the lines it touches -- PMM