From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S268285AbUIKTBG (ORCPT ); Sat, 11 Sep 2004 15:01:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268288AbUIKTBG (ORCPT ); Sat, 11 Sep 2004 15:01:06 -0400 Received: from verein.lst.de ([213.95.11.210]:35481 "EHLO mail.lst.de") by vger.kernel.org with ESMTP id S268285AbUIKS7X (ORCPT ); Sat, 11 Sep 2004 14:59:23 -0400 Date: Sat, 11 Sep 2004 20:59:18 +0200 From: Christoph Hellwig To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] small tweaks Message-ID: <20040911185918.GA22494@lst.de> Mail-Followup-To: Christoph Hellwig , akpm@osdl.org, linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Spam-Score: -4.901 () BAYES_00 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org - I misspelled CONFIG_PREEMPT CONFIG_PREEPT as various people noticed. But in fact that ifdef should just go, else we'll get drivers that compile with CONFIG_PREEMPT but not without sooner or later. - remove unused hardirq_trylock and hardirq_endlock --- 1.1/include/linux/hardirq.h 2004-09-08 08:32:57 +02:00 +++ edited/include/linux/hardirq.h 2004-09-10 16:11:31 +02:00 @@ -2,9 +2,7 @@ #define LINUX_HARDIRQ_H #include -#ifdef CONFIG_PREEPT #include -#endif #include #define __IRQ_MASK(x) ((1UL << (x))-1) @@ -28,9 +26,6 @@ #define in_irq() (hardirq_count()) #define in_softirq() (softirq_count()) #define in_interrupt() (irq_count()) - -#define hardirq_trylock() (!in_interrupt()) -#define hardirq_endlock() do { } while (0) #ifdef CONFIG_PREEMPT # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())