From patchwork Sun Apr 11 17:08:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John David Anglin X-Patchwork-Id: 91919 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3BH8sYv008612 for ; Sun, 11 Apr 2010 17:08:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752233Ab0DKRIy (ORCPT ); Sun, 11 Apr 2010 13:08:54 -0400 Received: from hiauly1.hia.nrc.ca ([132.246.100.193]:3293 "EHLO hiauly1.hia.nrc.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752203Ab0DKRIx (ORCPT ); Sun, 11 Apr 2010 13:08:53 -0400 Received: by hiauly1.hia.nrc.ca (Postfix, from userid 1000) id 7054C5057; Sun, 11 Apr 2010 13:08:52 -0400 (EDT) Date: Sun, 11 Apr 2010 13:08:51 -0400 From: John David Anglin To: "Carlos O'Donell" Cc: dave.anglin@nrc-cnrc.gc.ca, deller@gmx.de, gniibe@fsij.org, linux-parisc@vger.kernel.org Subject: [PATCH] Delete unnecessary nop's in entry.S Message-ID: <20100411170851.GB7756@hiauly1.hia.nrc.ca> Reply-To: John David Anglin References: <20100408215453.GA18445@hiauly1.hia.nrc.ca> <20100408224446.96F294FA3@hiauly1.hia.nrc.ca> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Organization: nrc.ca User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 11 Apr 2010 17:08:54 +0000 (UTC) diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 3a44f7f..a7e9472 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -997,13 +978,6 @@ intr_restore: rfi nop - nop - nop - nop - nop - nop - nop - nop #ifndef CONFIG_PREEMPT # define intr_do_preempt intr_restore