Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261577AbTEDTj3 (ORCPT ); Sun, 4 May 2003 15:39:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261617AbTEDTj3 (ORCPT ); Sun, 4 May 2003 15:39:29 -0400 Received: from covert.black-ring.iadfw.net ([209.196.123.142]:16904 "EHLO covert.brown-ring.iadfw.net") by vger.kernel.org with ESMTP id S261577AbTEDTjY (ORCPT ); Sun, 4 May 2003 15:39:24 -0400 Date: Sun, 4 May 2003 14:15:58 -0500 From: Art Haas To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [PATCH] Add C99 initializers to drivers/char/random.c Message-ID: <20030504191558.GB24907@debian> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3109 Lines: 104 Hi. This patch adds C99 initializers to the file. The patch is against the current BK (I've had this patch in use for many kernel releases). Art Haas ===== drivers/char/random.c 1.32 vs edited ===== --- 1.32/drivers/char/random.c Mon Mar 3 06:08:26 2003 +++ edited/drivers/char/random.c Fri Mar 7 10:29:59 2003 @@ -1848,27 +1848,62 @@ } ctl_table random_table[] = { - {RANDOM_POOLSIZE, "poolsize", - &sysctl_poolsize, sizeof(int), 0644, NULL, - &proc_do_poolsize, &poolsize_strategy}, - {RANDOM_ENTROPY_COUNT, "entropy_avail", - NULL, sizeof(int), 0444, NULL, - &proc_dointvec}, - {RANDOM_READ_THRESH, "read_wakeup_threshold", - &random_read_wakeup_thresh, sizeof(int), 0644, NULL, - &proc_dointvec_minmax, &sysctl_intvec, 0, - &min_read_thresh, &max_read_thresh}, - {RANDOM_WRITE_THRESH, "write_wakeup_threshold", - &random_write_wakeup_thresh, sizeof(int), 0644, NULL, - &proc_dointvec_minmax, &sysctl_intvec, 0, - &min_write_thresh, &max_write_thresh}, - {RANDOM_BOOT_ID, "boot_id", - &sysctl_bootid, 16, 0444, NULL, - &proc_do_uuid, &uuid_strategy}, - {RANDOM_UUID, "uuid", - NULL, 16, 0444, NULL, - &proc_do_uuid, &uuid_strategy}, - {0} + { + .ctl_name = RANDOM_POOLSIZE, + .procname = "poolsize", + .data = &sysctl_poolsize, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_do_poolsize, + .strategy = &poolsize_strategy, + }, + { + .ctl_name = RANDOM_ENTROPY_COUNT, + .procname = "entropy_avail", + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = &proc_dointvec, + }, + { + .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, + .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) -- To announce that there must be no criticism of the President, or that we are to stand by the President, right or wrong, is not only unpatriotic and servile, but is morally treasonable to the American public. -- Theodore Roosevelt, Kansas City Star, 1918 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/