diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /kernel/sysctl.c | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index da5152088cc3..1bf369bd4423 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -157,6 +157,7 @@ static int proc_dointvec_taint(struct ctl_table *table, int write, struct file * | |||
| 157 | static struct ctl_table root_table[]; | 157 | static struct ctl_table root_table[]; |
| 158 | static struct ctl_table_root sysctl_table_root; | 158 | static struct ctl_table_root sysctl_table_root; |
| 159 | static struct ctl_table_header root_table_header = { | 159 | static struct ctl_table_header root_table_header = { |
| 160 | .count = 1, | ||
| 160 | .ctl_table = root_table, | 161 | .ctl_table = root_table, |
| 161 | .ctl_entry = LIST_HEAD_INIT(sysctl_table_root.default_set.list), | 162 | .ctl_entry = LIST_HEAD_INIT(sysctl_table_root.default_set.list), |
| 162 | .root = &sysctl_table_root, | 163 | .root = &sysctl_table_root, |