Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
  security/tomoyo: Remove now unnecessary handling of security_sysctl.
  security/tomoyo: Add a special case to handle accesses through the internal proc mount.
  sysctl: Drop & in front of every proc_handler.
  sysctl: Remove CTL_NONE and CTL_UNNUMBERED
  sysctl: kill dead ctl_handler definitions.
  sysctl: Remove the last of the generic binary sysctl support
  sysctl net: Remove unused binary sysctl code
  sysctl security/tomoyo: Don't look at ctl_name
  sysctl arm: Remove binary sysctl support
  sysctl x86: Remove dead binary sysctl support
  sysctl sh: Remove dead binary sysctl support
  sysctl powerpc: Remove dead binary sysctl support
  sysctl ia64: Remove dead binary sysctl support
  sysctl s390: Remove dead sysctl binary support
  sysctl frv: Remove dead binary sysctl support
  sysctl mips/lasat: Remove dead binary sysctl support
  sysctl drivers: Remove dead binary sysctl support
  sysctl crypto: Remove dead binary sysctl support
  sysctl security/keys: Remove dead binary sysctl support
  sysctl kernel: Remove binary sysctl logic
  ...

1 files changed, 7 insertions, 47 deletions

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 04b505e5a5e2..dcd08635cf1b 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1257,94 +1257,54 @@ static int proc_do_uuid(ctl_table *table, int write,
         return proc_dostring(&fake_table, write, buffer, lenp, ppos);
 }
 
-static int uuid_strategy(ctl_table *table,
-                         void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen)
-{
-        unsigned char tmp_uuid[16], *uuid;
-        unsigned int len;
-
-        if (!oldval || !oldlenp)
-                return 1;
-
-        uuid = table->data;
-        if (!uuid) {
-                uuid = tmp_uuid;
-                uuid[8] = 0;
-        }
-        if (uuid[8] == 0)
-                generate_random_uuid(uuid);
-
-        if (get_user(len, oldlenp))
-                return -EFAULT;
-        if (len) {
-                if (len > 16)
-                        len = 16;
-                if (copy_to_user(oldval, uuid, len) ||
-                    put_user(len, oldlenp))
-                        return -EFAULT;
-        }
-        return 1;
-}
-
 static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
 ctl_table random_table[] = {
         {
-                .ctl_name       = RANDOM_POOLSIZE,
                 .procname       = "poolsize",
                 .data           = &sysctl_poolsize,
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = RANDOM_ENTROPY_COUNT,
                 .procname       = "entropy_avail",
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
                 .data           = &input_pool.entropy_count,
         },
         {
-                .ctl_name       = RANDOM_READ_THRESH,
                 .procname       = "read_wakeup_threshold",
                 .data           = &random_read_wakeup_thresh,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_read_thresh,
                 .extra2         = &max_read_thresh,
         },
         {
-                .ctl_name       = RANDOM_WRITE_THRESH,
                 .procname       = "write_wakeup_threshold",
                 .data           = &random_write_wakeup_thresh,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_write_thresh,
                 .extra2         = &max_write_thresh,
         },
         {
-                .ctl_name       = RANDOM_BOOT_ID,
                 .procname       = "boot_id",
                 .data           = &sysctl_bootid,
                 .maxlen         = 16,
                 .mode           = 0444,
-                .proc_handler   = &proc_do_uuid,
-                .strategy       = &uuid_strategy,
+                .proc_handler   = proc_do_uuid,
         },
         {
-                .ctl_name       = RANDOM_UUID,
                 .procname       = "uuid",
                 .maxlen         = 16,
                 .mode           = 0444,
-                .proc_handler   = &proc_do_uuid,
-                .strategy       = &uuid_strategy,
+                .proc_handler   = proc_do_uuid,
         },
-        { .ctl_name = 0 }
+        { }
 };
 #endif  /* CONFIG_SYSCTL */