summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-21 13:32:17 +0100
committerClark Williams <williams@redhat.com>2012-03-06 10:17:32 -0600
commit94a0305da35814da5dffb25317db7847345204a5 (patch)
treef1d3d8f3f4ee02d7b1b40f966889a5ab097c4bf2 /include/linux
parent0df0bbfd04a4946e93158a5535aa0238da6af7fb (diff)
preempt-mark-legitimated-no-resched-sites.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/preempt.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 58969b2a8a82..227b0f584719 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -48,12 +48,14 @@ do { \
barrier(); \
} while (0)
-#define preempt_enable_no_resched() \
+#define __preempt_enable_no_resched() \
do { \
barrier(); \
dec_preempt_count(); \
} while (0)
+#define preempt_enable_no_resched() __preempt_enable_no_resched()
+
#define preempt_enable() \
do { \
preempt_enable_no_resched(); \
@@ -92,6 +94,7 @@ do { \
#else /* !CONFIG_PREEMPT_COUNT */
#define preempt_disable() do { } while (0)
+#define __preempt_enable_no_resched() do { } while (0)
#define preempt_enable_no_resched() do { } while (0)
#define preempt_enable() do { } while (0)