Merge branch 'hpfs' from Mikulas Patocka

[firefly-linux-kernel-4.4.55.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 35487e8ded59f106e3a7b157aa3d5bf46f9579e8..0d91fe52f3f5eee10397563361a4b1dd1579e8cf 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1381,10 +1381,10 @@ static char sysctl_bootid[16];
  * as an ASCII string in the standard UUID format.  If accesses via the
  * sysctl system call, it is returned as 16 bytes of binary data.
  */
-static int proc_do_uuid(ctl_table *table, int write,
+static int proc_do_uuid(struct ctl_table *table, int write,
                        void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-       ctl_table fake_table;
+       struct ctl_table fake_table;
        unsigned char buf[64], tmp_uuid[16], *uuid;
 
        uuid = table->data;
@@ -1409,8 +1409,8 @@ static int proc_do_uuid(ctl_table *table, int write,
 }
 
 static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
-extern ctl_table random_table[];
-ctl_table random_table[] = {
+extern struct ctl_table random_table[];
+struct ctl_table random_table[] = {
        {
                .procname       = "poolsize",
                .data           = &sysctl_poolsize,