diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-05-27 14:32:13 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-05-27 14:32:13 +0200 |
| commit | ffa52910faff64f2070af42c22d782c4572d889e (patch) | |
| tree | 18c103f25a1467d02af1ebf27d7f0a8b177f5825 /arch/m68k/kernel/signal.c | |
| parent | 5ccbb2ee039f0bd81e2b34b670718186753a4e17 (diff) | |
| parent | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff) | |
Merge drm/drm-next into drm-misc-next
i915 is broken without -rc3, let's bring that tag in to fix it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'arch/m68k/kernel/signal.c')
| -rw-r--r-- | arch/m68k/kernel/signal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index a4b7ee1df211..8f215e79e70e 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -623,7 +623,8 @@ static inline void siginfo_build_tests(void) BUILD_BUG_ON(offsetof(siginfo_t, si_pkey) != 0x12); /* _sigfault._perf */ - BUILD_BUG_ON(offsetof(siginfo_t, si_perf) != 0x10); + BUILD_BUG_ON(offsetof(siginfo_t, si_perf_data) != 0x10); + BUILD_BUG_ON(offsetof(siginfo_t, si_perf_type) != 0x14); /* _sigpoll */ BUILD_BUG_ON(offsetof(siginfo_t, si_band) != 0x0c); |