From 0ff25cbe9ca30418d54e15d2380353c9e828845a Mon Sep 17 00:00:00 2001 From: Art Haas Date: Wed, 31 Jul 2002 22:23:13 -0700 Subject: [PATCH] designated initializer patches for Here are patches for designated initializers in kernel/*. --- kernel/futex.c | 8 ++++---- kernel/kmod.c | 14 +++++++------- kernel/module.c | 34 +++++++++++++++++----------------- kernel/platform.c | 14 +++++++------- kernel/sched.c | 2 +- kernel/sys.c | 2 +- kernel/sysctl.c | 6 +++--- kernel/user.c | 6 +++--- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'kernel') diff --git a/kernel/futex.c b/kernel/futex.c index dca7e1a84864..ef3dc8b00a5f 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -245,8 +245,8 @@ static unsigned int futex_poll(struct file *filp, } static struct file_operations futex_fops = { - release: futex_close, - poll: futex_poll, + .release = futex_close, + .poll = futex_poll, }; /* Signal allows caller to avoid the race which would occur if they @@ -357,8 +357,8 @@ futexfs_get_sb(struct file_system_type *fs_type, } static struct file_system_type futex_fs_type = { - name: "futexfs", - get_sb: futexfs_get_sb, + .name = "futexfs", + .get_sb = futexfs_get_sb, }; static int __init init(void) diff --git a/kernel/kmod.c b/kernel/kmod.c index d063d20001a4..53dd3ca194c3 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -346,15 +346,15 @@ int call_usermodehelper(char *path, char **argv, char **envp) { DECLARE_COMPLETION(work); struct subprocess_info sub_info = { - complete: &work, - path: path, - argv: argv, - envp: envp, - retval: 0, + .complete = &work, + .path = path, + .argv = argv, + .envp = envp, + .retval = 0, }; struct tq_struct tqs = { - routine: __call_usermodehelper, - data: &sub_info, + .routine = __call_usermodehelper, + .data = &sub_info, }; if (path[0] == '\0') diff --git a/kernel/module.c b/kernel/module.c index 8d2f2a46de0e..b9e8e9190944 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -44,15 +44,15 @@ extern const char __stop___kallsyms[] __attribute__ ((weak)); struct module kernel_module = { - size_of_struct: sizeof(struct module), - name: "", - uc: {ATOMIC_INIT(1)}, - flags: MOD_RUNNING, - syms: __start___ksymtab, - ex_table_start: __start___ex_table, - ex_table_end: __stop___ex_table, - kallsyms_start: __start___kallsyms, - kallsyms_end: __stop___kallsyms, + .size_of_struct = sizeof(struct module), + .name = "", + .uc = {ATOMIC_INIT(1)}, + .flags = MOD_RUNNING, + .syms = __start___ksymtab, + .ex_table_start = __start___ex_table, + .ex_table_end = __stop___ex_table, + .kallsyms_start = __start___kallsyms, + .kallsyms_end = __stop___kallsyms, }; struct module *module_list = &kernel_module; @@ -1132,10 +1132,10 @@ static int m_show(struct seq_file *m, void *p) return 0; } struct seq_operations modules_op = { - start: m_start, - next: m_next, - stop: m_stop, - show: m_show + .start = m_start, + .next = m_next, + .stop = m_stop, + .show = m_show }; /* @@ -1214,10 +1214,10 @@ static int s_show(struct seq_file *m, void *p) } struct seq_operations ksyms_op = { - start: s_start, - next: s_next, - stop: s_stop, - show: s_show + .start = s_start, + .next = s_next, + .stop = s_stop, + .show = s_show }; #else /* CONFIG_MODULES */ diff --git a/kernel/platform.c b/kernel/platform.c index 9848541526a6..66eb41af168d 100644 --- a/kernel/platform.c +++ b/kernel/platform.c @@ -23,13 +23,13 @@ int default_suspend(int state, int flags) } static struct platform_t default_platform = { - name: "Default Platform", - suspend_states: 0, - reboot: default_reboot, - halt: default_halt, - power_off: default_halt, - suspend: default_suspend, - idle: default_idle, + .name = "Default Platform", + .suspend_states = 0, + .reboot = default_reboot, + .halt = default_halt, + .power_off = default_halt, + .suspend = default_suspend, + .idle = default_idle, }; struct platform_t * platform = &default_platform; diff --git a/kernel/sched.c b/kernel/sched.c index 67ac32a24c1f..f90e63b8c1ec 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1819,7 +1819,7 @@ out: static int migration_thread(void * bind_cpu) { int cpu = (int) (long) bind_cpu; - struct sched_param param = { sched_priority: MAX_RT_PRIO-1 }; + struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; runqueue_t *rq; int ret; diff --git a/kernel/sys.c b/kernel/sys.c index 37a9525b3f1d..316a63de74ea 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -391,7 +391,7 @@ static void deferred_cad(void *dummy) void ctrl_alt_del(void) { static struct tq_struct cad_tq = { - routine: deferred_cad, + .routine = deferred_cad, }; if (C_A_D) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0c2c938efb65..653210748e64 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -126,12 +126,12 @@ static ssize_t proc_writesys(struct file *, const char *, size_t, loff_t *); static int proc_sys_permission(struct inode *, int); struct file_operations proc_sys_file_operations = { - read: proc_readsys, - write: proc_writesys, + .read = proc_readsys, + .write = proc_writesys, }; static struct inode_operations proc_sys_inode_operations = { - permission: proc_sys_permission, + .permission = proc_sys_permission, }; extern struct proc_dir_entry *proc_sys_root; diff --git a/kernel/user.c b/kernel/user.c index c77f52ea9cff..752cda29c965 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -28,9 +28,9 @@ static struct list_head uidhash_table[UIDHASH_SZ]; static spinlock_t uidhash_lock = SPIN_LOCK_UNLOCKED; struct user_struct root_user = { - __count: ATOMIC_INIT(1), - processes: ATOMIC_INIT(1), - files: ATOMIC_INIT(0) + .__count = ATOMIC_INIT(1), + .processes = ATOMIC_INIT(1), + .files = ATOMIC_INIT(0) }; /* -- cgit v1.2.3