summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/system.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-08-04 22:50:27 -0400
committerDmitry Torokhov <dtor@insightbb.com>2006-08-04 22:50:27 -0400
commitd932cb7e630cae3b6b5307b767d296ff1a597c5e (patch)
treef930d068a12a256fabef0864bcdf8e85f095369e /include/asm-cris/system.h
parent73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff)
parentf5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff)
downloadop-kernel-dev-d932cb7e630cae3b6b5307b767d296ff1a597c5e.zip
op-kernel-dev-d932cb7e630cae3b6b5307b767d296ff1a597c5e.tar.gz
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/asm-cris/system.h')
-rw-r--r--include/asm-cris/system.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index b1c593b..b869f61 100644
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -17,7 +17,6 @@ extern struct task_struct *resume(struct task_struct *prev, struct task_struct *
#define wmb() mb()
#define read_barrier_depends() do { } while(0)
#define set_mb(var, value) do { var = value; mb(); } while (0)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
#ifdef CONFIG_SMP
#define smp_mb() mb()
OpenPOWER on IntegriCloud