Messages in this thread Patch in this message | | | Date | Sat, 19 Jul 2008 04:52:31 +0100 | From | Al Viro <> | Subject | Re: linux-next: Tree for July 17: early crash on x86-64 |
| |
On Fri, Jul 18, 2008 at 05:52:23PM +0400, Alexander Beregalov wrote: > 2008/7/18 Rafael J. Wysocki <rjw@sisk.pl>: > > This one crashes all of my x86-64 test boxes early during boot. > The same problem with next-20080718. > Unfortunatelly I do not have serial console on that host.
vfs-next/net-next conflict; apply the patch below on top of the merge.
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index b91a5de..2240a9e 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -44,13 +44,6 @@ static struct ctl_table_root net_sysctl_root = { .lookup = net_ctl_header_lookup, }; -static LIST_HEAD(net_sysctl_ro_tables); -static struct list_head *net_ctl_ro_header_lookup(struct ctl_table_root *root, - struct nsproxy *namespaces) -{ - return &net_sysctl_ro_tables; -} - static int net_ctl_ro_header_perms(struct ctl_table_root *root, struct nsproxy *namespaces, struct ctl_table *table) { @@ -61,7 +54,6 @@ static int net_ctl_ro_header_perms(struct ctl_table_root *root, } static struct ctl_table_root net_sysctl_ro_root = { - .lookup = net_ctl_ro_header_lookup, .permissions = net_ctl_ro_header_perms, }; @@ -89,6 +81,7 @@ static __init int sysctl_init(void) if (ret) goto out; register_sysctl_root(&net_sysctl_root); + setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL); register_sysctl_root(&net_sysctl_ro_root); out: return ret;
| |