diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /kernel/sysctl.c | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0d949c517412..4dbf93a52ee9 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/sysrq.h> | 36 | #include <linux/sysrq.h> |
| 37 | #include <linux/highuid.h> | 37 | #include <linux/highuid.h> |
| 38 | #include <linux/writeback.h> | 38 | #include <linux/writeback.h> |
| 39 | #include <linux/ratelimit.h> | ||
| 39 | #include <linux/hugetlb.h> | 40 | #include <linux/hugetlb.h> |
| 40 | #include <linux/initrd.h> | 41 | #include <linux/initrd.h> |
| 41 | #include <linux/key.h> | 42 | #include <linux/key.h> |
| @@ -158,6 +159,8 @@ extern int no_unaligned_warning; | |||
| 158 | extern int unaligned_dump_stack; | 159 | extern int unaligned_dump_stack; |
| 159 | #endif | 160 | #endif |
| 160 | 161 | ||
| 162 | extern struct ratelimit_state printk_ratelimit_state; | ||
| 163 | |||
| 161 | #ifdef CONFIG_RT_MUTEXES | 164 | #ifdef CONFIG_RT_MUTEXES |
| 162 | extern int max_lock_depth; | 165 | extern int max_lock_depth; |
| 163 | #endif | 166 | #endif |
