From 25d00faffa0520761e83b33965aa453b3f35d4fa Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 21 Sep 2009 17:04:10 -0700
Subject: [PATCH] --- yaml --- r: 164507 b: refs/heads/master c:
 db4e5cbe2f201c6abd51f7dfe41dbd2589affeba h: refs/heads/master i:   164505:
 19cae6ef71409983b424d976276a9fc7f644c337   164503:
 6ae3ea9b7b9f40db0b16fa0cd22f1c4577320849 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/um/include/asm/hardirq.h | 26 +-------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index b1010228c573..d2840b791b92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 672917dcc781ead7652a8b11b1fba14e38ac15b8
+refs/heads/master: db4e5cbe2f201c6abd51f7dfe41dbd2589affeba
diff --git a/trunk/arch/um/include/asm/hardirq.h b/trunk/arch/um/include/asm/hardirq.h
index 313ebb8a2566..fb3c05a0cbbf 100644
--- a/trunk/arch/um/include/asm/hardirq.h
+++ b/trunk/arch/um/include/asm/hardirq.h
@@ -1,25 +1 @@
-/* (c) 2004 cw@f00f.org, GPLv2 blah blah */
-
-#ifndef __ASM_UM_HARDIRQ_H
-#define __ASM_UM_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-/* 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 <linux/irq_cpustat.h>
-
-/* 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 <asm-generic/hardirq.h>