Commit 5f5f2949 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Geert Uytterhoeven

m68k: Use sizeof_field() helper

Make use of the sizeof_field() helper instead of an open-coded version.
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20200527133942.GA10408@embeddedorSigned-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 40b13fd7
...@@ -61,25 +61,25 @@ ...@@ -61,25 +61,25 @@
#define FMT4SIZE 0 #define FMT4SIZE 0
#else #else
#define FORMAT 0 #define FORMAT 0
#define FMT4SIZE sizeof(((struct frame *)0)->un.fmt4) #define FMT4SIZE sizeof_field(struct frame, un.fmt4)
#endif #endif
static const int frame_size_change[16] = { static const int frame_size_change[16] = {
[1] = -1, /* sizeof(((struct frame *)0)->un.fmt1), */ [1] = -1, /* sizeof_field(struct frame, un.fmt1), */
[2] = sizeof(((struct frame *)0)->un.fmt2), [2] = sizeof_field(struct frame, un.fmt2),
[3] = sizeof(((struct frame *)0)->un.fmt3), [3] = sizeof_field(struct frame, un.fmt3),
[4] = FMT4SIZE, [4] = FMT4SIZE,
[5] = -1, /* sizeof(((struct frame *)0)->un.fmt5), */ [5] = -1, /* sizeof_field(struct frame, un.fmt5), */
[6] = -1, /* sizeof(((struct frame *)0)->un.fmt6), */ [6] = -1, /* sizeof_field(struct frame, un.fmt6), */
[7] = sizeof(((struct frame *)0)->un.fmt7), [7] = sizeof_field(struct frame, un.fmt7),
[8] = -1, /* sizeof(((struct frame *)0)->un.fmt8), */ [8] = -1, /* sizeof_field(struct frame, un.fmt8), */
[9] = sizeof(((struct frame *)0)->un.fmt9), [9] = sizeof_field(struct frame, un.fmt9),
[10] = sizeof(((struct frame *)0)->un.fmta), [10] = sizeof_field(struct frame, un.fmta),
[11] = sizeof(((struct frame *)0)->un.fmtb), [11] = sizeof_field(struct frame, un.fmtb),
[12] = -1, /* sizeof(((struct frame *)0)->un.fmtc), */ [12] = -1, /* sizeof_field(struct frame, un.fmtc), */
[13] = -1, /* sizeof(((struct frame *)0)->un.fmtd), */ [13] = -1, /* sizeof_field(struct frame, un.fmtd), */
[14] = -1, /* sizeof(((struct frame *)0)->un.fmte), */ [14] = -1, /* sizeof_field(struct frame, un.fmte), */
[15] = -1, /* sizeof(((struct frame *)0)->un.fmtf), */ [15] = -1, /* sizeof_field(struct frame, un.fmtf), */
}; };
static inline int frame_extra_sizes(int f) static inline int frame_extra_sizes(int f)
...@@ -651,7 +651,7 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec, ...@@ -651,7 +651,7 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec,
} else { } else {
struct switch_stack *sw = (struct switch_stack *)regs - 1; struct switch_stack *sw = (struct switch_stack *)regs - 1;
/* yes, twice as much as max(sizeof(frame.un.fmt<x>)) */ /* yes, twice as much as max(sizeof(frame.un.fmt<x>)) */
unsigned long buf[sizeof(((struct frame *)0)->un) / 2]; unsigned long buf[sizeof_field(struct frame, un) / 2];
/* that'll make sure that expansion won't crap over data */ /* that'll make sure that expansion won't crap over data */
if (copy_from_user(buf + fsize / 4, fp, fsize)) if (copy_from_user(buf + fsize / 4, fp, fsize))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment