Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 397cffebb3b6..b34b5b9792f0 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -26,12 +26,6 @@ static ctl_table unix_table[] = {
         { }
 };
 
-static struct ctl_path unix_path[] = {
-        { .procname = "net", },
-        { .procname = "unix", },
-        { },
-};
-
 int __net_init unix_sysctl_register(struct net *net)
 {
         struct ctl_table *table;
@@ -41,7 +35,7 @@ int __net_init unix_sysctl_register(struct net *net)
                 goto err_alloc;
 
         table[0].data = &net->unx.sysctl_max_dgram_qlen;
-        net->unx.ctl = register_net_sysctl_table(net, unix_path, table);
+        net->unx.ctl = register_net_sysctl(net, "net/unix", table);
         if (net->unx.ctl == NULL)
                 goto err_reg;
 
@@ -58,6 +52,6 @@ void unix_sysctl_unregister(struct net *net)
         struct ctl_table *table;
 
         table = net->unx.ctl->ctl_table_arg;
-        unregister_sysctl_table(net->unx.ctl);
+        unregister_net_sysctl_table(net->unx.ctl);
         kfree(table);
 }