On Fri, Feb 22, 2019 at 12:24:18PM +0000, Vincenzo Frascino wrote:
> diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h
> index 1f05268f4c6d..a6fd7be1b22a 100644
> --- a/arch/arm64/include/asm/signal32.h
> +++ b/arch/arm64/include/asm/signal32.h
> @@ -52,7 +52,7 @@ struct compat_ucontext {
> compat_stack_t uc_stack;
> struct compat_sigcontext uc_mcontext;
> compat_sigset_t uc_sigmask;
> - int __unused[32 - (sizeof(compat_sigset_t) / sizeof(int))];
> + int __unused[32 - (sizeof(compat_sigset_t) / sizeof(int))];
Spurious whitespace change?
> +/* Macros for asm-offsets.c */
> +#define OFFSET_OF_COMPAT_SIGFRAME_REGS ( \
> + offsetof(struct compat_sigframe, uc) + \
> + offsetof(struct compat_ucontext, uc_mcontext) + \
> + offsetof(struct compat_sigcontext, arm_r0))
> +
> +#define OFFSET_OF_COMPAT_RT_SIGFRAME_REGS ( \
> + offsetof(struct compat_rt_sigframe, sig) + \
> + offsetof(struct compat_sigframe, uc) + \
> + offsetof(struct compat_ucontext, uc_mcontext) + \
> + offsetof(struct compat_sigcontext, arm_r0))
> +
> int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
> struct pt_regs *regs);
> int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
> index 4adb52190a90..afd28ccda174 100644
> --- a/arch/arm64/kernel/asm-offsets.c
> +++ b/arch/arm64/kernel/asm-offsets.c
> @@ -30,6 +30,7 @@
> #include <asm/fixmap.h>
> #include <asm/thread_info.h>
> #include <asm/memory.h>
> +#include <asm/signal32.h>
> #include <asm/smp_plat.h>
> #include <asm/suspend.h>
> #include <linux/kbuild.h>
> @@ -84,6 +85,11 @@ int main(void)
> DEFINE(S_STACKFRAME, offsetof(struct pt_regs, stackframe));
> DEFINE(S_FRAME_SIZE, sizeof(struct pt_regs));
> BLANK();
> +#ifdef CONFIG_COMPAT
> + DEFINE(COMPAT_SIGFRAME_REGS_OFFSET, OFFSET_OF_COMPAT_SIGFRAME_REGS);
> + DEFINE(COMPAT_RT_SIGFRAME_REGS_OFFSET, OFFSET_OF_COMPAT_RT_SIGFRAME_REGS);
Can't we do:
DEFINE(COMPAT_SIGFRAME_REGS_OFFSET, offsetof(struct compat_sigframe, uc.us_mcontext.arm_r0)
DEFINE(COMPAT_RT_SIGFRAME_REGS_OFFSET, offsetof(struct compat_rt_sigframe, sig.uc.us_mcontext.arm_r0)
... and avoid the OFFSET_OF_* macros entirely?
Thanks,
Mark.
