Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187318
b: refs/heads/master
c: 4f0e056
h: refs/heads/master
v: v3
  • Loading branch information
Dave Young authored and Linus Torvalds committed Mar 12, 2010
1 parent 56bc763 commit a2d69b7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 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: c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3
refs/heads/master: 4f0e056fdebc15d3f4724ebc7bbf323158add1d7
2 changes: 2 additions & 0 deletions trunk/include/linux/rtmutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <linux/plist.h>
#include <linux/spinlock_types.h>

extern int max_lock_depth; /* for sysctl */

/**
* The rt_mutex structure
*
Expand Down
7 changes: 3 additions & 4 deletions trunk/kernel/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
#ifdef CONFIG_BSD_PROCESS_ACCT
#include <linux/acct.h>
#endif
#ifdef CONFIG_RT_MUTEXES
#include <linux/rtmutex.h>
#endif
#ifdef CONFIG_CHR_DEV_SG
#include <scsi/sg.h>
#endif
Expand Down Expand Up @@ -150,10 +153,6 @@ extern int unaligned_dump_stack;

extern struct ratelimit_state printk_ratelimit_state;

#ifdef CONFIG_RT_MUTEXES
extern int max_lock_depth;
#endif

#ifdef CONFIG_PROC_SYSCTL
static int proc_do_cad_pid(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
Expand Down

0 comments on commit a2d69b7

Please sign in to comment.