Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 222205
b: refs/heads/master
c: ed1d77b
h: refs/heads/master
i:
  222203: e2ff911
v: v3
  • Loading branch information
Linus Torvalds committed Nov 18, 2010
1 parent d421721 commit 25702ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fb3ff69d1397ce4bd2441c87b1daea67cb945ac6
refs/heads/master: ed1d77b18c9f4ff06d5b42c65041aa55a1447053
1 change: 1 addition & 0 deletions trunk/include/linux/hardirq.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
#define in_nmi() (preempt_count() & NMI_MASK)

#if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL)
# include <linux/sched.h>
# define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0)
#else
# define PREEMPT_INATOMIC_BASE 0
Expand Down

0 comments on commit 25702ff

Please sign in to comment.