From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932557AbZHDO5H (ORCPT ); Tue, 4 Aug 2009 10:57:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755611AbZHDO5G (ORCPT ); Tue, 4 Aug 2009 10:57:06 -0400 Received: from verein.lst.de ([213.95.11.210]:60784 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753423AbZHDO5F (ORCPT ); Tue, 4 Aug 2009 10:57:05 -0400 Date: Tue, 4 Aug 2009 16:56:53 +0200 From: Christoph Hellwig To: jdike@addtoit.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH] um: convert to asm-generic/hardirq.h Message-ID: <20090804145653.GN20487@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Spam-Score: -0.349 () BAYES_30 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig Index: linux-2.6/arch/um/include/asm/hardirq.h =================================================================== --- linux-2.6.orig/arch/um/include/asm/hardirq.h 2009-07-27 14:32:58.969148744 +0200 +++ linux-2.6/arch/um/include/asm/hardirq.h 2009-07-27 14:57:49.430900969 +0200 @@ -1,25 +1 @@ -/* (c) 2004 cw@f00f.org, GPLv2 blah blah */ - -#ifndef __ASM_UM_HARDIRQ_H -#define __ASM_UM_HARDIRQ_H - -#include -#include - -/* NOTE: When SMP works again we might want to make this - * ____cacheline_aligned or maybe use per_cpu state? --cw */ -typedef struct { - unsigned int __softirq_pending; -} irq_cpustat_t; - -#include - -/* As this would be very strange for UML to get we BUG() after the - * printk. */ -static inline void ack_bad_irq(unsigned int irq) -{ - printk(KERN_ERR "unexpected IRQ %02x\n", irq); - BUG(); -} - -#endif /* __ASM_UM_HARDIRQ_H */ +#include