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

Commit 1cb8bb45 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.62 into android-3.18 



Changes in 3.18.62
	ipv6: avoid unregistering inet6_dev for loopback
	tcp: reset sk_rx_dst in tcp_disconnect()
	net: prevent sign extension in dev_get_stats()
	ipv6: dad: don't remove dynamic addresses if link is down
	brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
	cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE
	cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
	cfg80211: Check if PMKID attribute is of expected size
	irqchip/gic-v3: Fix out-of-bound access in gic_set_affinity
	parisc: Report SIGSEGV instead of SIGBUS when running out of stack
	parisc: use compat_sys_keyctl()
	parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs
	parisc/mm: Ensure IRQs are off in switch_mm()
	tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth
	kernel/extable.c: mark core_kernel_text notrace
	fs/dcache.c: fix spin lockup issue on nlru->lock
	checkpatch: silence perl 5.26.0 unescaped left brace warnings
	exec: Limit arg stack to at most 75% of _STK_LIM
	vt: fix unchecked __put_user() in tioclinux ioctls
	mm: fix overflow check in expand_upwards()
	crypto: talitos - Extend max key length for SHA384/512-HMAC and AEAD
	crypto: atmel - only treat EBUSY as transient if backlog
	crypto: sha1-ssse3 - Disable avx2
	crypto: caam - fix signals handling
	sched/topology: Optimize build_group_mask()
	sched/topology: Fix overlapping sched_group_mask
	PM / QoS: return -EINVAL for bogus strings
	tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
	Linux 3.18.62

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6e3ad2ce dd8b674c

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 61

SUBLEVEL = 62

EXTRAVERSION =

NAME = Diseased Newt

arch/parisc/include/asm/dma-mapping.h

+7 −4
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ struct hppa_dma_ops { 
** flush/purge and allocate "regular" cacheable pages for everything.

*/



#define DMA_ERROR_CODE	(~(dma_addr_t)0)



#ifdef CONFIG_PA11

extern struct hppa_dma_ops pcxl_dma_ops;

extern struct hppa_dma_ops pcx_dma_ops;
@@ -209,12 +211,13 @@ parisc_walk_tree(struct device *dev) 
			break;

		}

	}

	BUG_ON(!dev->platform_data);

	return dev->platform_data;

}



#define GET_IOC(dev) (HBA_DATA(parisc_walk_tree(dev))->iommu)

	

#define GET_IOC(dev) ({					\

	void *__pdata = parisc_walk_tree(dev);		\

	__pdata ? HBA_DATA(__pdata)->iommu : NULL;	\

})



#ifdef CONFIG_IOMMU_CCIO

struct parisc_device;

arch/parisc/include/asm/mmu_context.h

+13 −2
Original line number Diff line number Diff line
@@ -49,15 +49,26 @@ static inline void load_context(mm_context_t context) 
	mtctl(__space_to_prot(context), 8);

}



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)

static inline void switch_mm_irqs_off(struct mm_struct *prev,

		struct mm_struct *next, struct task_struct *tsk)

{



	if (prev != next) {

		mtctl(__pa(next->pgd), 25);

		load_context(next->context);

	}

}



static inline void switch_mm(struct mm_struct *prev,

		struct mm_struct *next, struct task_struct *tsk)

{

	unsigned long flags;



	local_irq_save(flags);

	switch_mm_irqs_off(prev, next, tsk);

	local_irq_restore(flags);

}

#define switch_mm_irqs_off switch_mm_irqs_off



#define deactivate_mm(tsk,mm)	do { } while (0)



static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)

arch/parisc/kernel/syscall_table.S

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ 
	ENTRY_SAME(ni_syscall)	/* 263: reserved for vserver */

	ENTRY_SAME(add_key)

	ENTRY_SAME(request_key)		/* 265 */

	ENTRY_SAME(keyctl)

	ENTRY_COMP(keyctl)

	ENTRY_SAME(ioprio_set)

	ENTRY_SAME(ioprio_get)

	ENTRY_SAME(inotify_init)

arch/parisc/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ bad_area: 
		case 15:	/* Data TLB miss fault/Data page fault */

			/* send SIGSEGV when outside of vma */

			if (!vma ||

			    address < vma->vm_start || address > vma->vm_end) {

			    address < vma->vm_start || address >= vma->vm_end) {

				si.si_signo = SIGSEGV;

				si.si_code = SEGV_MAPERR;

				break;