From e803dacd5fbf677f4103d74c168b6022587475e6 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Tue, 6 Mar 2012 17:57:33 +0800 Subject: [PATCH] --- yaml --- r: 302762 b: refs/heads/master c: 966f58c2f6df826f385706673a9bb1edcfd3499a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/srcu.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 09e2419d2c41..2d098463f041 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b52ce066c55a6a53cf1f8d71308d74f908e31b99 +refs/heads/master: 966f58c2f6df826f385706673a9bb1edcfd3499a diff --git a/trunk/include/linux/srcu.h b/trunk/include/linux/srcu.h index 15354db3e865..e5ce80452b62 100644 --- a/trunk/include/linux/srcu.h +++ b/trunk/include/linux/srcu.h @@ -44,12 +44,6 @@ struct srcu_struct { #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */ }; -#ifndef CONFIG_PREEMPT -#define srcu_barrier() barrier() -#else /* #ifndef CONFIG_PREEMPT */ -#define srcu_barrier() -#endif /* #else #ifndef CONFIG_PREEMPT */ - #ifdef CONFIG_DEBUG_LOCK_ALLOC int __init_srcu_struct(struct srcu_struct *sp, const char *name,