Merge branches 'intel_pstate-fix' and 'cpufreq-x86-fix'

[mirror_ubuntu-artful-kernel.git] / lib / test_sysctl.c

diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c
index 1472e1ae4931751fec878335163df06ba4e011ef..3dd801c1c85b3ce179b44968cb9fe33f5ee45c30 100644 (file)
--- a/lib/test_sysctl.c
+++ b/lib/test_sysctl.c
@@ -42,6 +42,9 @@ static int i_one_hundred = 100;
 struct test_sysctl_data {
        int int_0001;
        int int_0002;
+       int int_0003[4];
+
+       unsigned int uint_0001;
 
        char string_0001[65];
 };
@@ -50,6 +53,13 @@ static struct test_sysctl_data test_data = {
        .int_0001 = 60,
        .int_0002 = 1,
 
+       .int_0003[0] = 0,
+       .int_0003[1] = 1,
+       .int_0003[2] = 2,
+       .int_0003[3] = 3,
+
+       .uint_0001 = 314,
+
        .string_0001 = "(none)",
 };
 
@@ -71,6 +81,20 @@ static struct ctl_table test_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
+       {
+               .procname       = "int_0003",
+               .data           = &test_data.int_0003,
+               .maxlen         = sizeof(test_data.int_0003),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
+       },
+       {
+               .procname       = "uint_0001",
+               .data           = &test_data.uint_0001,
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = proc_douintvec,
+       },
        {
                .procname       = "string_0001",
                .data           = &test_data.string_0001,