Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 508ac0ad authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.143 (7bbfac19) into msm-4.4 



* refs/heads/tmp-7bbfac19
  Linux 4.4.143
  net/nfc: Avoid stalls when nfc_alloc_send_skb() returned NULL.
  rds: avoid unenecessary cong_update in loop transport
  KEYS: DNS: fix parsing multiple options
  netfilter: ebtables: reject non-bridge targets
  MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()
  MIPS: Call dump_stack() from show_regs()
  rtlwifi: rtl8821ae: fix firmware is not ready to run
  net: cxgb3_main: fix potential Spectre v1
  net/mlx5: Fix command interface race in polling mode
  net_sched: blackhole: tell upper qdisc about dropped packets
  vhost_net: validate sock before trying to put its fd
  tcp: prevent bogus FRTO undos with non-SACK flows
  tcp: fix Fast Open key endianness
  r8152: napi hangup fix after disconnect
  qed: Limit msix vectors in kdump kernel to the minimum required count.
  net: sungem: fix rx checksum support
  net/mlx5: Fix incorrect raw command length parsing
  net: dccp: switch rx_tstamp_last_feedback to monotonic clock
  net: dccp: avoid crash in ccid3_hc_rx_send_feedback()
  atm: zatm: Fix potential Spectre v1
  crypto: crypto4xx - fix crypto4xx_build_pdr, crypto4xx_build_sdr leak
  crypto: crypto4xx - remove bad list_del
  bcm63xx_enet: do not write to random DMA channel on BCM6345
  bcm63xx_enet: correct clock usage
  ocfs2: subsystem.su_mutex is required while accessing the item->ci_parent
  Revert "sit: reload iphdr in ipip6_rcv"
  x86/asm: Add _ASM_ARG* constants for argument registers to <asm/asm.h>
  compiler-gcc.h: Add __attribute__((gnu_inline)) to all inline declarations
  compiler, clang: always inline when CONFIG_OPTIMIZE_INLINING is disabled
  compiler, clang: properly override 'inline' for clang
  compiler, clang: suppress warning for unused static inline functions

Change-Id: Ia4be0ff93c81aee090c38127014680460e8cc756
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents c2e09fad 7bbfac19

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 142

SUBLEVEL = 143

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/mips/kernel/process.c

+29 −2
Original line number Diff line number Diff line
@@ -633,21 +633,48 @@ unsigned long arch_align_stack(unsigned long sp) 
	return sp & ALMASK;

}



static DEFINE_PER_CPU(struct call_single_data, backtrace_csd);

static struct cpumask backtrace_csd_busy;



static void arch_dump_stack(void *info)

{

	struct pt_regs *regs;

	static arch_spinlock_t lock = __ARCH_SPIN_LOCK_UNLOCKED;



	arch_spin_lock(&lock);

	regs = get_irq_regs();



	if (regs)

		show_regs(regs);



	else

		dump_stack();

	arch_spin_unlock(&lock);



	cpumask_clear_cpu(smp_processor_id(), &backtrace_csd_busy);

}



void arch_trigger_all_cpu_backtrace(bool include_self)

{

	smp_call_function(arch_dump_stack, NULL, 1);

	struct call_single_data *csd;

	int cpu;



	for_each_cpu(cpu, cpu_online_mask) {

		/*

		 * If we previously sent an IPI to the target CPU & it hasn't

		 * cleared its bit in the busy cpumask then it didn't handle

		 * our previous IPI & it's not safe for us to reuse the

		 * call_single_data_t.

		 */

		if (cpumask_test_and_set_cpu(cpu, &backtrace_csd_busy)) {

			pr_warn("Unable to send backtrace IPI to CPU%u - perhaps it hung?\n",

				cpu);

			continue;

		}



		csd = &per_cpu(backtrace_csd, cpu);

		csd->func = arch_dump_stack;

		smp_call_function_single_async(cpu, csd);

	}

}



int mips_get_process_fp_mode(struct task_struct *task)

arch/mips/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ static void __show_regs(const struct pt_regs *regs) 
void show_regs(struct pt_regs *regs)

{

	__show_regs((struct pt_regs *)regs);

	dump_stack();

}



void show_registers(struct pt_regs *regs)

arch/x86/include/asm/asm.h

+59 −0
Original line number Diff line number Diff line
@@ -45,6 +45,65 @@ 
#define _ASM_SI		__ASM_REG(si)

#define _ASM_DI		__ASM_REG(di)



#ifndef __x86_64__

/* 32 bit */



#define _ASM_ARG1	_ASM_AX

#define _ASM_ARG2	_ASM_DX

#define _ASM_ARG3	_ASM_CX



#define _ASM_ARG1L	eax

#define _ASM_ARG2L	edx

#define _ASM_ARG3L	ecx



#define _ASM_ARG1W	ax

#define _ASM_ARG2W	dx

#define _ASM_ARG3W	cx



#define _ASM_ARG1B	al

#define _ASM_ARG2B	dl

#define _ASM_ARG3B	cl



#else

/* 64 bit */



#define _ASM_ARG1	_ASM_DI

#define _ASM_ARG2	_ASM_SI

#define _ASM_ARG3	_ASM_DX

#define _ASM_ARG4	_ASM_CX

#define _ASM_ARG5	r8

#define _ASM_ARG6	r9



#define _ASM_ARG1Q	rdi

#define _ASM_ARG2Q	rsi

#define _ASM_ARG3Q	rdx

#define _ASM_ARG4Q	rcx

#define _ASM_ARG5Q	r8

#define _ASM_ARG6Q	r9



#define _ASM_ARG1L	edi

#define _ASM_ARG2L	esi

#define _ASM_ARG3L	edx

#define _ASM_ARG4L	ecx

#define _ASM_ARG5L	r8d

#define _ASM_ARG6L	r9d



#define _ASM_ARG1W	di

#define _ASM_ARG2W	si

#define _ASM_ARG3W	dx

#define _ASM_ARG4W	cx

#define _ASM_ARG5W	r8w

#define _ASM_ARG6W	r9w



#define _ASM_ARG1B	dil

#define _ASM_ARG2B	sil

#define _ASM_ARG3B	dl

#define _ASM_ARG4B	cl

#define _ASM_ARG5B	r8b

#define _ASM_ARG6B	r9b



#endif



/* Exception table entry */

#ifdef __ASSEMBLY__

# define _ASM_EXTABLE(from,to)					\

drivers/atm/zatm.c

+2 −0
Original line number Diff line number Diff line
@@ -1481,6 +1481,8 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg) 
					return -EFAULT;

				if (pool < 0 || pool > ZATM_LAST_POOL)

					return -EINVAL;

				pool = array_index_nospec(pool,

							  ZATM_LAST_POOL + 1);

				if (copy_from_user(&info,

				    &((struct zatm_pool_req __user *) arg)->info,

				    sizeof(info))) return -EFAULT;