diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /ipc | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mq_sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c index 89f60ec8ee54..24ae46dfe45d 100644 --- a/ipc/mq_sysctl.c +++ b/ipc/mq_sysctl.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define MIN_MSGSIZEMAX 128 /* min value for msgsize_max */ | 22 | #define MIN_MSGSIZEMAX 128 /* min value for msgsize_max */ |
| 23 | #define MAX_MSGSIZEMAX (8192*128) /* max value for msgsize_max */ | 23 | #define MAX_MSGSIZEMAX (8192*128) /* max value for msgsize_max */ |
| 24 | 24 | ||
| 25 | #ifdef CONFIG_PROC_SYSCTL | ||
| 25 | static void *get_mq(ctl_table *table) | 26 | static void *get_mq(ctl_table *table) |
| 26 | { | 27 | { |
| 27 | char *which = table->data; | 28 | char *which = table->data; |
| @@ -30,7 +31,6 @@ static void *get_mq(ctl_table *table) | |||
| 30 | return which; | 31 | return which; |
| 31 | } | 32 | } |
| 32 | 33 | ||
| 33 | #ifdef CONFIG_PROC_SYSCTL | ||
| 34 | static int proc_mq_dointvec(ctl_table *table, int write, struct file *filp, | 34 | static int proc_mq_dointvec(ctl_table *table, int write, struct file *filp, |
| 35 | void __user *buffer, size_t *lenp, loff_t *ppos) | 35 | void __user *buffer, size_t *lenp, loff_t *ppos) |
| 36 | { | 36 | { |