Commit 64b1f2ed authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] small <linux/hardirq.h> tweaks

- 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
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b08b6ae8
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
#define LINUX_HARDIRQ_H #define LINUX_HARDIRQ_H
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_PREEPT
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#endif
#include <asm/hardirq.h> #include <asm/hardirq.h>
#define __IRQ_MASK(x) ((1UL << (x))-1) #define __IRQ_MASK(x) ((1UL << (x))-1)
...@@ -29,9 +27,6 @@ ...@@ -29,9 +27,6 @@
#define in_softirq() (softirq_count()) #define in_softirq() (softirq_count())
#define in_interrupt() (irq_count()) #define in_interrupt() (irq_count())
#define hardirq_trylock() (!in_interrupt())
#define hardirq_endlock() do { } while (0)
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
# define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
# define preemptible() (preempt_count() == 0 && !irqs_disabled()) # define preemptible() (preempt_count() == 0 && !irqs_disabled())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment