diff --git a/[refs] b/[refs] index aeb0b303a904..a34318b0a268 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29e796fd4de54b8f5bc30d897611210ece4fd0f2 +refs/heads/master: 23eb06de7d2d333a0f7ebba2da663e00c9c9483e diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h index 3b6e2c9fbb2e..77de3bfd8744 100644 --- a/trunk/include/linux/sysctl.h +++ b/trunk/include/linux/sysctl.h @@ -1057,6 +1057,7 @@ struct ctl_table_header struct list_head ctl_entry; int used; struct completion *unregistering; + struct ctl_table *ctl_table_arg; }; /* struct ctl_path describes where in the hierarchy a table is added */ diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index f580542333eb..89b7d95ecf51 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -1669,6 +1669,7 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path, new += 2; } *prevp = table; + header->ctl_table_arg = table; INIT_LIST_HEAD(&header->ctl_entry); header->used = 0;