Skip to content

Commit 0ba5df8

Browse files
rpedgecohansendc
authored andcommitted
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
1 parent d28abd2 commit 0ba5df8

1 file changed

Lines changed: 65 additions & 42 deletions

File tree

arch/x86/kernel/ptrace.c

Lines changed: 65 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,28 +1235,37 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
12351235

12361236
static struct user_regset x86_64_regsets[] __ro_after_init = {
12371237
[REGSET64_GENERAL] = {
1238-
.core_note_type = NT_PRSTATUS,
1239-
.n = sizeof(struct user_regs_struct) / sizeof(long),
1240-
.size = sizeof(long), .align = sizeof(long),
1241-
.regset_get = genregs_get, .set = genregs_set
1238+
.core_note_type = NT_PRSTATUS,
1239+
.n = sizeof(struct user_regs_struct) / sizeof(long),
1240+
.size = sizeof(long),
1241+
.align = sizeof(long),
1242+
.regset_get = genregs_get,
1243+
.set = genregs_set
12421244
},
12431245
[REGSET64_FP] = {
1244-
.core_note_type = NT_PRFPREG,
1245-
.n = sizeof(struct fxregs_state) / sizeof(long),
1246-
.size = sizeof(long), .align = sizeof(long),
1247-
.active = regset_xregset_fpregs_active, .regset_get = xfpregs_get, .set = xfpregs_set
1246+
.core_note_type = NT_PRFPREG,
1247+
.n = sizeof(struct fxregs_state) / sizeof(long),
1248+
.size = sizeof(long),
1249+
.align = sizeof(long),
1250+
.active = regset_xregset_fpregs_active,
1251+
.regset_get = xfpregs_get,
1252+
.set = xfpregs_set
12481253
},
12491254
[REGSET64_XSTATE] = {
1250-
.core_note_type = NT_X86_XSTATE,
1251-
.size = sizeof(u64), .align = sizeof(u64),
1252-
.active = xstateregs_active, .regset_get = xstateregs_get,
1253-
.set = xstateregs_set
1255+
.core_note_type = NT_X86_XSTATE,
1256+
.size = sizeof(u64),
1257+
.align = sizeof(u64),
1258+
.active = xstateregs_active,
1259+
.regset_get = xstateregs_get,
1260+
.set = xstateregs_set
12541261
},
12551262
[REGSET64_IOPERM] = {
1256-
.core_note_type = NT_386_IOPERM,
1257-
.n = IO_BITMAP_LONGS,
1258-
.size = sizeof(long), .align = sizeof(long),
1259-
.active = ioperm_active, .regset_get = ioperm_get
1263+
.core_note_type = NT_386_IOPERM,
1264+
.n = IO_BITMAP_LONGS,
1265+
.size = sizeof(long),
1266+
.align = sizeof(long),
1267+
.active = ioperm_active,
1268+
.regset_get = ioperm_get
12601269
},
12611270
};
12621271

@@ -1276,42 +1285,56 @@ static const struct user_regset_view user_x86_64_view = {
12761285
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
12771286
static struct user_regset x86_32_regsets[] __ro_after_init = {
12781287
[REGSET32_GENERAL] = {
1279-
.core_note_type = NT_PRSTATUS,
1280-
.n = sizeof(struct user_regs_struct32) / sizeof(u32),
1281-
.size = sizeof(u32), .align = sizeof(u32),
1282-
.regset_get = genregs32_get, .set = genregs32_set
1288+
.core_note_type = NT_PRSTATUS,
1289+
.n = sizeof(struct user_regs_struct32) / sizeof(u32),
1290+
.size = sizeof(u32),
1291+
.align = sizeof(u32),
1292+
.regset_get = genregs32_get,
1293+
.set = genregs32_set
12831294
},
12841295
[REGSET32_FP] = {
1285-
.core_note_type = NT_PRFPREG,
1286-
.n = sizeof(struct user_i387_ia32_struct) / sizeof(u32),
1287-
.size = sizeof(u32), .align = sizeof(u32),
1288-
.active = regset_fpregs_active, .regset_get = fpregs_get, .set = fpregs_set
1296+
.core_note_type = NT_PRFPREG,
1297+
.n = sizeof(struct user_i387_ia32_struct) / sizeof(u32),
1298+
.size = sizeof(u32),
1299+
.align = sizeof(u32),
1300+
.active = regset_fpregs_active,
1301+
.regset_get = fpregs_get,
1302+
.set = fpregs_set
12891303
},
12901304
[REGSET32_XFP] = {
1291-
.core_note_type = NT_PRXFPREG,
1292-
.n = sizeof(struct fxregs_state) / sizeof(u32),
1293-
.size = sizeof(u32), .align = sizeof(u32),
1294-
.active = regset_xregset_fpregs_active, .regset_get = xfpregs_get, .set = xfpregs_set
1305+
.core_note_type = NT_PRXFPREG,
1306+
.n = sizeof(struct fxregs_state) / sizeof(u32),
1307+
.size = sizeof(u32),
1308+
.align = sizeof(u32),
1309+
.active = regset_xregset_fpregs_active,
1310+
.regset_get = xfpregs_get,
1311+
.set = xfpregs_set
12951312
},
12961313
[REGSET32_XSTATE] = {
1297-
.core_note_type = NT_X86_XSTATE,
1298-
.size = sizeof(u64), .align = sizeof(u64),
1299-
.active = xstateregs_active, .regset_get = xstateregs_get,
1300-
.set = xstateregs_set
1314+
.core_note_type = NT_X86_XSTATE,
1315+
.size = sizeof(u64),
1316+
.align = sizeof(u64),
1317+
.active = xstateregs_active,
1318+
.regset_get = xstateregs_get,
1319+
.set = xstateregs_set
13011320
},
13021321
[REGSET32_TLS] = {
1303-
.core_note_type = NT_386_TLS,
1304-
.n = GDT_ENTRY_TLS_ENTRIES, .bias = GDT_ENTRY_TLS_MIN,
1305-
.size = sizeof(struct user_desc),
1306-
.align = sizeof(struct user_desc),
1307-
.active = regset_tls_active,
1308-
.regset_get = regset_tls_get, .set = regset_tls_set
1322+
.core_note_type = NT_386_TLS,
1323+
.n = GDT_ENTRY_TLS_ENTRIES,
1324+
.bias = GDT_ENTRY_TLS_MIN,
1325+
.size = sizeof(struct user_desc),
1326+
.align = sizeof(struct user_desc),
1327+
.active = regset_tls_active,
1328+
.regset_get = regset_tls_get,
1329+
.set = regset_tls_set
13091330
},
13101331
[REGSET32_IOPERM] = {
1311-
.core_note_type = NT_386_IOPERM,
1312-
.n = IO_BITMAP_BYTES / sizeof(u32),
1313-
.size = sizeof(u32), .align = sizeof(u32),
1314-
.active = ioperm_active, .regset_get = ioperm_get
1332+
.core_note_type = NT_386_IOPERM,
1333+
.n = IO_BITMAP_BYTES / sizeof(u32),
1334+
.size = sizeof(u32),
1335+
.align = sizeof(u32),
1336+
.active = ioperm_active,
1337+
.regset_get = ioperm_get
13151338
},
13161339
};
13171340

0 commit comments

Comments
 (0)