Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187314
b: refs/heads/master
c: e5ab677
h: refs/heads/master
v: v3
  • Loading branch information
Dave Young authored and Linus Torvalds committed Mar 12, 2010
1 parent a60cd87 commit 92f29c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d33ed52d57e794eba55cea3f5eab3c8f80b6cb5a
refs/heads/master: e5ab67726f33b50f40db0ccf271ceb3c658554d5
4 changes: 4 additions & 0 deletions trunk/include/linux/rcupdate.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
#include <linux/lockdep.h>
#include <linux/completion.h>

#ifdef CONFIG_RCU_TORTURE_TEST
extern int rcutorture_runnable; /* for sysctl */
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */

/**
* struct rcu_head - callback structure for use with RCU
* @next: next update requests in a list
Expand Down
3 changes: 0 additions & 3 deletions trunk/kernel/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
#ifndef CONFIG_MMU
extern int sysctl_nr_trim_pages;
#endif
#ifdef CONFIG_RCU_TORTURE_TEST
extern int rcutorture_runnable;
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
#ifdef CONFIG_BLOCK
extern int blk_iopoll_enabled;
#endif
Expand Down

0 comments on commit 92f29c1

Please sign in to comment.