linux-next: manual merge of the m68knommu tree with the m68k tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2635 bytes --]

Hi all,

Today's linux-next merge of the m68knommu tree got a conflict in:

  arch/m68k/kernel/ptrace.c

between commit:

  c862fe70b023 ("m68k: Wire up syscall_trace_enter/leave for m68k")

from the m68k tree and commit:

  0d91043d8bdf ("m68knommu: implement minimal regset support")

from the m68knommu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/m68k/kernel/ptrace.c
index daebccdd2c09,4349b9c4dd68..000000000000
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@@ -284,3 -292,60 +286,59 @@@ asmlinkage void syscall_trace_leave(voi
  	if (test_thread_flag(TIF_SYSCALL_TRACE))
  		ptrace_report_syscall_exit(task_pt_regs(current), 0);
  }
 -#endif /* CONFIG_COLDFIRE */
+ 
+ #if defined(CONFIG_BINFMT_ELF_FDPIC) && defined(CONFIG_ELF_CORE)
+ /*
+  * Currently the only thing that needs to use regsets for m68k is the
+  * coredump support of the elf_fdpic loader. Implement the minimum
+  * definitions required for that.
+  */
+ static int m68k_regset_get(struct task_struct *target,
+ 			   const struct user_regset *regset,
+ 			   struct membuf to)
+ {
+ 	struct pt_regs *ptregs = task_pt_regs(target);
+ 	u32 uregs[ELF_NGREG];
+ 
+ 	ELF_CORE_COPY_REGS(uregs, ptregs);
+ 	return membuf_write(&to, uregs, sizeof(uregs));
+ }
+ 
+ enum m68k_regset {
+ 	REGSET_GPR,
+ #ifdef CONFIG_FPU
+ 	REGSET_FPU,
+ #endif
+ };
+ 
+ static const struct user_regset m68k_user_regsets[] = {
+ 	[REGSET_GPR] = {
+ 		.core_note_type = NT_PRSTATUS,
+ 		.n = ELF_NGREG,
+ 		.size = sizeof(u32),
+ 		.align = sizeof(u16),
+ 		.regset_get = m68k_regset_get,
+ 	},
+ #ifdef CONFIG_FPU
+ 	[REGSET_FPU] = {
+ 		.core_note_type = NT_PRFPREG,
+ 		.n = sizeof(struct user_m68kfp_struct) / sizeof(u32),
+ 		.size = sizeof(u32),
+ 		.align = sizeof(u32),
+ 	}
+ #endif /* CONFIG_FPU */
+ };
+ 
+ static const struct user_regset_view user_m68k_view = {
+ 	.name = "m68k",
+ 	.e_machine = EM_68K,
+ 	.ei_osabi = ELF_OSABI,
+ 	.regsets = m68k_user_regsets,
+ 	.n = ARRAY_SIZE(m68k_user_regsets)
+ };
+ 
+ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
+ {
+ 	return &user_m68k_view;
+ }
+ #endif /* CONFIG_BINFMT_ELF_FDPIC && CONFIG_ELF_CORE */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]