From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:51:00 +0000 (+0100)
Subject: Merge tag 'v3.10.96' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca0dd0f30e36b1ad73353464cda5c3f0c7fcf49c;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.96' into update

This is the 3.10.96 stable release
---

ca0dd0f30e36b1ad73353464cda5c3f0c7fcf49c
diff --cc arch/arm64/kernel/ptrace.c
index 1e0bcd6a9f5b,dfad98fda4f8..20060334d87e
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@@ -58,8 -51,36 +58,14 @@@
   */
  void ptrace_disable(struct task_struct *child)
  {
+ 	/*
+ 	 * This would be better off in core code, but PTRACE_DETACH has
+ 	 * grown its fair share of arch-specific worts and changing it
+ 	 * is likely to cause regressions on obscure architectures.
+ 	 */
+ 	user_disable_single_step(child);
  }
  
 -/*
 - * Handle hitting a breakpoint.
 - */
 -static int ptrace_break(struct pt_regs *regs)
 -{
 -	siginfo_t info = {
 -		.si_signo = SIGTRAP,
 -		.si_errno = 0,
 -		.si_code  = TRAP_BRKPT,
 -		.si_addr  = (void __user *)instruction_pointer(regs),
 -	};
 -
 -	force_sig_info(SIGTRAP, &info, current);
 -	return 0;
 -}
 -
 -static int arm64_break_trap(unsigned long addr, unsigned int esr,
 -			    struct pt_regs *regs)
 -{
 -	return ptrace_break(regs);
 -}
 -
  #ifdef CONFIG_HAVE_HW_BREAKPOINT
  /*
   * Handle hitting a HW-breakpoint.
diff --cc drivers/usb/host/xhci.c
index f6b22759626e,4dc18615cd0f..1316a03c1a43
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -5147,12 -4815,11 +5155,16 @@@ static int __init xhci_hcd_init(void
  	BUILD_BUG_ON(sizeof(struct xhci_intr_reg) != 8*32/8);
  	/* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */
  	BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8);
+ 
+ 	if (usb_disabled())
+ 		return -ENODEV;
+ 
  	return 0;
 +
 +#ifdef CONFIG_MTK_XHCI
 +unreg_plat:
 +    xhci_unregister_plat();
 +#endif
  unreg_pci:
  	xhci_unregister_pci();
  	return retval;