Commit 8ef464f9 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] c99 initialisers for random.c

parent 97944ab0
...@@ -1850,27 +1850,62 @@ static int uuid_strategy(ctl_table *table, int *name, int nlen, ...@@ -1850,27 +1850,62 @@ static int uuid_strategy(ctl_table *table, int *name, int nlen,
} }
ctl_table random_table[] = { ctl_table random_table[] = {
{RANDOM_POOLSIZE, "poolsize", {
&sysctl_poolsize, sizeof(int), 0644, NULL, .ctl_name = RANDOM_POOLSIZE,
&proc_do_poolsize, &poolsize_strategy}, .procname = "poolsize",
{RANDOM_ENTROPY_COUNT, "entropy_avail", .data = &sysctl_poolsize,
NULL, sizeof(int), 0444, NULL, .maxlen = sizeof(int),
&proc_dointvec}, .mode = 0644,
{RANDOM_READ_THRESH, "read_wakeup_threshold", .proc_handler = &proc_do_poolsize,
&random_read_wakeup_thresh, sizeof(int), 0644, NULL, .strategy = &poolsize_strategy,
&proc_dointvec_minmax, &sysctl_intvec, 0, },
&min_read_thresh, &max_read_thresh}, {
{RANDOM_WRITE_THRESH, "write_wakeup_threshold", .ctl_name = RANDOM_ENTROPY_COUNT,
&random_write_wakeup_thresh, sizeof(int), 0644, NULL, .procname = "entropy_avail",
&proc_dointvec_minmax, &sysctl_intvec, 0, .maxlen = sizeof(int),
&min_write_thresh, &max_write_thresh}, .mode = 0444,
{RANDOM_BOOT_ID, "boot_id", .proc_handler = &proc_dointvec,
&sysctl_bootid, 16, 0444, NULL, },
&proc_do_uuid, &uuid_strategy}, {
{RANDOM_UUID, "uuid", .ctl_name = RANDOM_READ_THRESH,
NULL, 16, 0444, NULL, .procname = "read_wakeup_threshold",
&proc_do_uuid, &uuid_strategy}, .data = &random_read_wakeup_thresh,
{0} .maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec,
.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,
.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,
},
{
.ctl_name = RANDOM_UUID,
.procname = "uuid",
.maxlen = 16,
.mode = 0444,
.proc_handler = &proc_do_uuid,
.strategy = &uuid_strategy,
},
{ .ctl_name = 0 }
}; };
static void sysctl_init_random(struct entropy_store *random_state) static void sysctl_init_random(struct entropy_store *random_state)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment