Commit 0ba5df84 authored by Rick Edgecombe's avatar Rick Edgecombe Committed by Dave Hansen
Browse files

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: default avatarRick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20221021221803.10910-3-rick.p.edgecombe%40intel.com
parent d28abd23

arch/x86/kernel/ptrace.c

+65 −42
Original line number Diff line number Diff line
@@ -1237,26 +1237,35 @@ 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

		.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

		.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,

		.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

		.size		= sizeof(long),

		.align		= sizeof(long),

		.active		= ioperm_active,

		.regset_get	= ioperm_get

	},

};
@@ -1278,40 +1287,54 @@ 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

		.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

		.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

		.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,

		.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,

		.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

		.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

		.size		= sizeof(u32),

		.align		= sizeof(u32),

		.active		= ioperm_active,

		.regset_get	= ioperm_get

	},

};