sysctl: clean up char buffer arguments

[pandora-kernel.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 74f5b58..3e214be 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -643,7 +643,7 @@ static struct ctl_table kern_table[] = {
                .extra2         = &one,
        },
 #endif
-
+#ifdef CONFIG_UEVENT_HELPER
        {
                .procname       = "hotplug",
                .data           = &uevent_helper,
@@ -651,7 +651,7 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dostring,
        },
-
+#endif
 #ifdef CONFIG_CHR_DEV_SG
        {
                .procname       = "sg-big-buff",
@@ -1418,8 +1418,13 @@ static struct ctl_table vm_table[] = {
    (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
        {
                .procname       = "vdso_enabled",
+#ifdef CONFIG_X86_32
+               .data           = &vdso32_enabled,
+               .maxlen         = sizeof(vdso32_enabled),
+#else
                .data           = &vdso_enabled,
                .maxlen         = sizeof(vdso_enabled),
+#endif
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
                .extra1         = &zero,
@@ -1698,8 +1703,8 @@ int __init sysctl_init(void)
 
 #ifdef CONFIG_PROC_SYSCTL
 
-static int _proc_do_string(void* data, int maxlen, int write,
-                          void __user *buffer,
+static int _proc_do_string(char *data, int maxlen, int write,
+                          char __user *buffer,
                           size_t *lenp, loff_t *ppos)
 {
        size_t len;
@@ -1725,7 +1730,7 @@ static int _proc_do_string(void* data, int maxlen, int write,
                        len = maxlen-1;
                if(copy_from_user(data, buffer, len))
                        return -EFAULT;
-               ((char *) data)[len] = 0;
+               data[len] = 0;
                *ppos += *lenp;
        } else {
                len = strlen(data);
@@ -1743,10 +1748,10 @@ static int _proc_do_string(void* data, int maxlen, int write,
                if (len > *lenp)
                        len = *lenp;
                if (len)
-                       if(copy_to_user(buffer, data, len))
+                       if (copy_to_user(buffer, data, len))
                                return -EFAULT;
                if (len < *lenp) {
-                       if(put_user('\n', ((char __user *) buffer) + len))
+                       if (put_user('\n', buffer + len))
                                return -EFAULT;
                        len++;
                }
@@ -1776,8 +1781,8 @@ static int _proc_do_string(void* data, int maxlen, int write,
 int proc_dostring(struct ctl_table *table, int write,
                  void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-       return _proc_do_string(table->data, table->maxlen, write,
-                              buffer, lenp, ppos);
+       return _proc_do_string((char *)(table->data), table->maxlen, write,
+                              (char __user *)buffer, lenp, ppos);
 }
 
 static size_t proc_skip_spaces(char **buf)