x86: Improve formatting of user_regset arrays

Back in 2018, Ingo Molnar suggested[0] to improve the formatting of the
struct user_regset arrays. They have multiple member initializations per
line and some lines exceed 100 chars. Reformat them like he suggested.

[0] https://lore.kernel.org/lkml/20180711102035.GB8574@gmail.com/

Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20221021221803.10910-3-rick.p.edgecombe%40intel.com

diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 356495ab37a6e464c76090999e8de7f02b52ddf6..dfaa270a7cc98bc3b1688d4c48b5a993ba6c3038 100644 (file)
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1235,28 +1235,37 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 
 static struct user_regset x86_64_regsets[] __ro_after_init = {
        [REGSET64_GENERAL] = {
-               .core_note_type = NT_PRSTATUS,
-               .n = sizeof(struct user_regs_struct) / sizeof(long),
-               .size = sizeof(long), .align = sizeof(long),
-               .regset_get = genregs_get, .set = genregs_set
+               .core_note_type = NT_PRSTATUS,
+               .n              = sizeof(struct user_regs_struct) / sizeof(long),
+               .size           = sizeof(long),
+               .align          = sizeof(long),
+               .regset_get     = genregs_get,
+               .set            = genregs_set
        },
        [REGSET64_FP] = {
-               .core_note_type = NT_PRFPREG,
-               .n = sizeof(struct fxregs_state) / sizeof(long),
-               .size = sizeof(long), .align = sizeof(long),
-               .active = regset_xregset_fpregs_active, .regset_get = xfpregs_get, .set = xfpregs_set
+               .core_note_type = NT_PRFPREG,
+               .n              = sizeof(struct fxregs_state) / sizeof(long),
+               .size           = sizeof(long),
+               .align          = sizeof(long),
+               .active         = regset_xregset_fpregs_active,
+               .regset_get     = xfpregs_get,
+               .set            = xfpregs_set
        },
        [REGSET64_XSTATE] = {
-               .core_note_type = NT_X86_XSTATE,
-               .size = sizeof(u64), .align = sizeof(u64),
-               .active = xstateregs_active, .regset_get = xstateregs_get,
-               .set = xstateregs_set
+               .core_note_type = NT_X86_XSTATE,
+               .size           = sizeof(u64),
+               .align          = sizeof(u64),
+               .active         = xstateregs_active,
+               .regset_get     = xstateregs_get,
+               .set            = xstateregs_set
        },
        [REGSET64_IOPERM] = {
-               .core_note_type = NT_386_IOPERM,
-               .n = IO_BITMAP_LONGS,
-               .size = sizeof(long), .align = sizeof(long),
-               .active = ioperm_active, .regset_get = ioperm_get
+               .core_note_type = NT_386_IOPERM,
+               .n              = IO_BITMAP_LONGS,
+               .size           = sizeof(long),
+               .align          = sizeof(long),
+               .active         = ioperm_active,
+               .regset_get     = ioperm_get
        },
 };
 
@@ -1276,42 +1285,56 @@ static const struct user_regset_view user_x86_64_view = {
 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
 static struct user_regset x86_32_regsets[] __ro_after_init = {
        [REGSET32_GENERAL] = {
-               .core_note_type = NT_PRSTATUS,
-               .n = sizeof(struct user_regs_struct32) / sizeof(u32),
-               .size = sizeof(u32), .align = sizeof(u32),
-               .regset_get = genregs32_get, .set = genregs32_set
+               .core_note_type = NT_PRSTATUS,
+               .n              = sizeof(struct user_regs_struct32) / sizeof(u32),
+               .size           = sizeof(u32),
+               .align          = sizeof(u32),
+               .regset_get     = genregs32_get,
+               .set            = genregs32_set
        },
        [REGSET32_FP] = {
-               .core_note_type = NT_PRFPREG,
-               .n = sizeof(struct user_i387_ia32_struct) / sizeof(u32),
-               .size = sizeof(u32), .align = sizeof(u32),
-               .active = regset_fpregs_active, .regset_get = fpregs_get, .set = fpregs_set
+               .core_note_type = NT_PRFPREG,
+               .n              = sizeof(struct user_i387_ia32_struct) / sizeof(u32),
+               .size           = sizeof(u32),
+               .align          = sizeof(u32),
+               .active         = regset_fpregs_active,
+               .regset_get     = fpregs_get,
+               .set            = fpregs_set
        },
        [REGSET32_XFP] = {
-               .core_note_type = NT_PRXFPREG,
-               .n = sizeof(struct fxregs_state) / sizeof(u32),
-               .size = sizeof(u32), .align = sizeof(u32),
-               .active = regset_xregset_fpregs_active, .regset_get = xfpregs_get, .set = xfpregs_set
+               .core_note_type = NT_PRXFPREG,
+               .n              = sizeof(struct fxregs_state) / sizeof(u32),
+               .size           = sizeof(u32),
+               .align          = sizeof(u32),
+               .active         = regset_xregset_fpregs_active,
+               .regset_get     = xfpregs_get,
+               .set            = xfpregs_set
        },
        [REGSET32_XSTATE] = {
-               .core_note_type = NT_X86_XSTATE,
-               .size = sizeof(u64), .align = sizeof(u64),
-               .active = xstateregs_active, .regset_get = xstateregs_get,
-               .set = xstateregs_set
+               .core_note_type = NT_X86_XSTATE,
+               .size           = sizeof(u64),
+               .align          = sizeof(u64),
+               .active         = xstateregs_active,
+               .regset_get     = xstateregs_get,
+               .set            = xstateregs_set
        },
        [REGSET32_TLS] = {
-               .core_note_type = NT_386_TLS,
-               .n = GDT_ENTRY_TLS_ENTRIES, .bias = GDT_ENTRY_TLS_MIN,
-               .size = sizeof(struct user_desc),
-               .align = sizeof(struct user_desc),
-               .active = regset_tls_active,
-               .regset_get = regset_tls_get, .set = regset_tls_set
+               .core_note_type = NT_386_TLS,
+               .n              = GDT_ENTRY_TLS_ENTRIES,
+               .bias           = GDT_ENTRY_TLS_MIN,
+               .size           = sizeof(struct user_desc),
+               .align          = sizeof(struct user_desc),
+               .active         = regset_tls_active,
+               .regset_get     = regset_tls_get,
+               .set            = regset_tls_set
        },
        [REGSET32_IOPERM] = {
-               .core_note_type = NT_386_IOPERM,
-               .n = IO_BITMAP_BYTES / sizeof(u32),
-               .size = sizeof(u32), .align = sizeof(u32),
-               .active = ioperm_active, .regset_get = ioperm_get
+               .core_note_type = NT_386_IOPERM,
+               .n              = IO_BITMAP_BYTES / sizeof(u32),
+               .size           = sizeof(u32),
+               .align          = sizeof(u32),
+               .active         = ioperm_active,
+               .regset_get     = ioperm_get
        },
 };