[PATCH] designated initializers for include/linux

These are the completely generic bits (linux/init_task.h and linux/wait.h).

From: Art Haas <ahaas@neosoft.com>

  Here's the latest diffs for the files in include/linux.
  Patches are against 2.5.31.

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 56c6b71817961cd2771097339b8a3c039a9147a6..d023d2360a715fe3fe1ed467965af791e576f8e6 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -5,34 +5,34 @@
 
 #define INIT_FILES \
 {                                                      \
-       count:          ATOMIC_INIT(1),                 \
-       file_lock:      RW_LOCK_UNLOCKED,               \
-       max_fds:        NR_OPEN_DEFAULT,                \
-       max_fdset:      __FD_SETSIZE,                   \
-       next_fd:        0,                              \
-       fd:             &init_files.fd_array[0],        \
-       close_on_exec:  &init_files.close_on_exec_init, \
-       open_fds:       &init_files.open_fds_init,      \
-       close_on_exec_init: { { 0, } },                 \
-       open_fds_init:  { { 0, } },                     \
-       fd_array:       { NULL, }                       \
+       .count          = ATOMIC_INIT(1),               \
+       .file_lock      = RW_LOCK_UNLOCKED,             \
+       .max_fds        = NR_OPEN_DEFAULT,              \
+       .max_fdset      = __FD_SETSIZE,                 \
+       .next_fd        = 0,                            \
+       .fd             = &init_files.fd_array[0],      \
+       .close_on_exec  = &init_files.close_on_exec_init, \
+       .open_fds       = &init_files.open_fds_init,    \
+       .close_on_exec_init = { { 0, } },               \
+       .open_fds_init  = { { 0, } },                   \
+       .fd_array       = { NULL, }                     \
 }
 
 #define INIT_MM(name) \
 {                                                      \
-       mm_rb:          RB_ROOT,                        \
-       pgd:            swapper_pg_dir,                 \
-       mm_users:       ATOMIC_INIT(2),                 \
-       mm_count:       ATOMIC_INIT(1),                 \
-       mmap_sem:       __RWSEM_INITIALIZER(name.mmap_sem), \
-       page_table_lock: SPIN_LOCK_UNLOCKED,            \
-       mmlist:         LIST_HEAD_INIT(name.mmlist),    \
+       .mm_rb          = RB_ROOT,                      \
+       .pgd            = swapper_pg_dir,               \
+       .mm_users       = ATOMIC_INIT(2),               \
+       .mm_count       = ATOMIC_INIT(1),               \
+       .mmap_sem       = __RWSEM_INITIALIZER(name.mmap_sem), \
+       .page_table_lock =  SPIN_LOCK_UNLOCKED,         \
+       .mmlist         = LIST_HEAD_INIT(name.mmlist),  \
 }
 
 #define INIT_SIGNALS { \
-       count:          ATOMIC_INIT(1),                 \
-       action:         { {{0,}}, },                    \
-       siglock:        SPIN_LOCK_UNLOCKED              \
+       .count          = ATOMIC_INIT(1),               \
+       .action         = { {{0,}}, },                  \
+       .siglock        = SPIN_LOCK_UNLOCKED            \
 }
 
 /*
@@ -41,45 +41,45 @@
  */
 #define INIT_TASK(tsk) \
 {                                                                      \
-    state:             0,                                              \
-    thread_info:       &init_thread_info,                              \
-    flags:             0,                                              \
-    lock_depth:                -1,                                             \
-    prio:              MAX_PRIO-20,                                    \
-    static_prio:       MAX_PRIO-20,                                    \
-    policy:            SCHED_NORMAL,                                   \
-    cpus_allowed:      -1,                                             \
-    mm:                        NULL,                                           \
-    active_mm:         &init_mm,                                       \
-    run_list:          LIST_HEAD_INIT(tsk.run_list),                   \
-    time_slice:                HZ,                                             \
-    tasks:             LIST_HEAD_INIT(tsk.tasks),                      \
-    real_parent:       &tsk,                                           \
-    parent:            &tsk,                                           \
-    children:          LIST_HEAD_INIT(tsk.children),                   \
-    sibling:           LIST_HEAD_INIT(tsk.sibling),                    \
-    thread_group:      LIST_HEAD_INIT(tsk.thread_group),               \
-    wait_chldexit:     __WAIT_QUEUE_HEAD_INITIALIZER(tsk.wait_chldexit),\
-    real_timer:                {                                               \
-       function:               it_real_fn                              \
-    },                                                                 \
-    cap_effective:     CAP_INIT_EFF_SET,                               \
-    cap_inheritable:   CAP_INIT_INH_SET,                               \
-    cap_permitted:     CAP_FULL_SET,                                   \
-    keep_capabilities: 0,                                              \
-    rlim:              INIT_RLIMITS,                                   \
-    user:              INIT_USER,                                      \
-    comm:              "swapper",                                      \
-    thread:            INIT_THREAD,                                    \
-    fs:                        &init_fs,                                       \
-    files:             &init_files,                                    \
-    sigmask_lock:      SPIN_LOCK_UNLOCKED,                             \
-    sig:               &init_signals,                                  \
-    pending:           { NULL, &tsk.pending.head, {{0}}},              \
-    blocked:           {{0}},                                          \
-    alloc_lock:                SPIN_LOCK_UNLOCKED,                             \
-    switch_lock:       SPIN_LOCK_UNLOCKED,                             \
-    journal_info:      NULL,                                           \
+       .state          = 0,                                            \
+       .thread_info    = &init_thread_info,                            \
+       .flags          = 0,                                            \
+       .lock_depth     = -1,                                           \
+       .prio           = MAX_PRIO-20,                                  \
+       .static_prio    = MAX_PRIO-20,                                  \
+       .policy         = SCHED_NORMAL,                                 \
+       .cpus_allowed   = -1,                                           \
+       .mm             = NULL,                                         \
+       .active_mm      = &init_mm,                                     \
+       .run_list       = LIST_HEAD_INIT(tsk.run_list),                 \
+       .time_slice     = HZ,                                           \
+       .tasks          = LIST_HEAD_INIT(tsk.tasks),                    \
+       .real_parent    = &tsk,                                         \
+       .parent         = &tsk,                                         \
+       .children       = LIST_HEAD_INIT(tsk.children),                 \
+       .sibling        = LIST_HEAD_INIT(tsk.sibling),                  \
+       .thread_group   = LIST_HEAD_INIT(tsk.thread_group),             \
+       .wait_chldexit  = __WAIT_QUEUE_HEAD_INITIALIZER(tsk.wait_chldexit),\
+       .real_timer     = {                                             \
+               .function       = it_real_fn                            \
+       },                                                              \
+       .cap_effective  = CAP_INIT_EFF_SET,                             \
+       .cap_inheritable = CAP_INIT_INH_SET,                            \
+       .cap_permitted  = CAP_FULL_SET,                                 \
+       .keep_capabilities = 0,                                         \
+       .rlim           = INIT_RLIMITS,                                 \
+       .user           = INIT_USER,                                    \
+       .comm           = "swapper",                                    \
+       .thread         = INIT_THREAD,                                  \
+       .fs             = &init_fs,                                     \
+       .files          = &init_files,                                  \
+       .sigmask_lock   = SPIN_LOCK_UNLOCKED,                           \
+       .sig            = &init_signals,                                \
+       .pending        = { NULL, &tsk.pending.head, {{0}}},            \
+       .blocked        = {{0}},                                        \
+       .alloc_lock     = SPIN_LOCK_UNLOCKED,                           \
+       .switch_lock    = SPIN_LOCK_UNLOCKED,                           \
+       .journal_info   = NULL,                                         \
 }
 
 

diff --git a/include/linux/wait.h b/include/linux/wait.h
index 4141ba6e6ed5a70fa3f6164cd7d9eeef3d376509..8664b02f230da8fec4a99154f4d7fe5c94a9ecbb 100644 (file)
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -43,16 +43,16 @@ typedef struct __wait_queue_head wait_queue_head_t;
  */
 
 #define __WAITQUEUE_INITIALIZER(name, tsk) {                           \
-       task:           tsk,                                            \
-       func:           default_wake_function,                          \
-       task_list:      { NULL, NULL } }
+       .task           = tsk,                                          \
+       .func           = default_wake_function,                        \
+       .task_list      = { NULL, NULL } }
 
 #define DECLARE_WAITQUEUE(name, tsk)                                   \
        wait_queue_t name = __WAITQUEUE_INITIALIZER(name, tsk)
 
 #define __WAIT_QUEUE_HEAD_INITIALIZER(name) {                          \
-       lock:           SPIN_LOCK_UNLOCKED,                             \
-       task_list:      { &(name).task_list, &(name).task_list } }
+       .lock           = SPIN_LOCK_UNLOCKED,                           \
+       .task_list      = { &(name).task_list, &(name).task_list } }
 
 #define DECLARE_WAIT_QUEUE_HEAD(name) \
        wait_queue_head_t name = __WAIT_QUEUE_HEAD_INITIALIZER(name)