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

Commit 0166b9e3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.166 into android-4.9 



Changes in 4.9.166
	mmc: pxamci: fix enum type confusion
	drm/vmwgfx: Don't double-free the mode stored in par->set_mode
	iommu/amd: fix sg->dma_address for sg->offset bigger than PAGE_SIZE
	libceph: wait for latest osdmap in ceph_monc_blacklist_add()
	udf: Fix crash on IO error during truncate
	mips: loongson64: lemote-2f: Add IRQF_NO_SUSPEND to "cascade" irqaction.
	MIPS: Ensure ELF appended dtb is relocated
	MIPS: Fix kernel crash for R6 in jump label branch function
	futex: Ensure that futex address is aligned in handle_futex_death()
	objtool: Move objtool_file struct off the stack
	ext4: fix NULL pointer dereference while journal is aborted
	ext4: fix data corruption caused by unaligned direct AIO
	ext4: brelse all indirect buffer in ext4_ind_remove_space()
	media: v4l2-ctrls.c/uvc: zero v4l2_event
	Bluetooth: Fix decrementing reference count twice in releasing socket
	locking/lockdep: Add debug_locks check in __lock_downgrade()
	ALSA: hda - Record the current power state before suspend/resume calls
	ALSA: hda - Enforces runtime_resume after S3 and S4 for each codec
	tcp/dccp: drop SYN packets if accept queue is full
	serial: sprd: adjust TIMEOUT to a big value
	Hang/soft lockup in d_invalidate with simultaneous calls
	arm64: traps: disable irq in die()
	serial: sprd: clear timeout interrupt only rather than all interrupts
	lib/int_sqrt: optimize small argument
	USB: core: only clean up what we allocated
	scsi: ufs: fix wrong command type of UTRD for UFSHCI v2.1
	rtc: Fix overflow when converting time64_t to rtc_time
	pwm-backlight: Enable/disable the PWM before/after LCD enable toggle.
	power: supply: charger-manager: Fix incorrect return value
	ath10k: avoid possible string overflow
	Linux 4.9.166

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 86a136d9 60771fc4

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 165

SUBLEVEL = 166

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/kernel/traps.c

+6 −2
Original line number Diff line number Diff line
@@ -272,10 +272,12 @@ static DEFINE_RAW_SPINLOCK(die_lock); 
void die(const char *str, struct pt_regs *regs, int err)

{

	int ret;

	unsigned long flags;



	raw_spin_lock_irqsave(&die_lock, flags);



	oops_enter();



	raw_spin_lock_irq(&die_lock);

	console_verbose();

	bust_spinlocks(1);

	ret = __die(str, err, regs);
@@ -285,13 +287,15 @@ void die(const char *str, struct pt_regs *regs, int err) 


	bust_spinlocks(0);

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	raw_spin_unlock_irq(&die_lock);

	oops_exit();



	if (in_interrupt())

		panic("Fatal exception in interrupt");

	if (panic_on_oops)

		panic("Fatal exception");



	raw_spin_unlock_irqrestore(&die_lock, flags);



	if (ret != NOTIFY_STOP)

		do_exit(SIGSEGV);

}

arch/mips/include/asm/jump_label.h

+4 −4
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ 
#endif



#ifdef CONFIG_CPU_MICROMIPS

#define NOP_INSN "nop32"

#define B_INSN "b32"

#else

#define NOP_INSN "nop"

#define B_INSN "b"

#endif



static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

{

	asm_volatile_goto("1:\t" NOP_INSN "\n\t"

		"nop\n\t"

	asm_volatile_goto("1:\t" B_INSN " 2f\n\t"

		"2:\tnop\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"

		".popsection\n\t"

arch/mips/kernel/vmlinux.lds.S

+7 −5
Original line number Diff line number Diff line
@@ -138,6 +138,13 @@ SECTIONS 
	PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)

#endif



#ifdef CONFIG_MIPS_ELF_APPENDED_DTB

	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {

		*(.appended_dtb)

		KEEP(*(.appended_dtb))

	}

#endif



#ifdef CONFIG_RELOCATABLE

	. = ALIGN(4);
@@ -162,11 +169,6 @@ SECTIONS 
	__appended_dtb = .;

	/* leave space for appended DTB */

	. += 0x100000;

#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)

	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {

		*(.appended_dtb)

		KEEP(*(.appended_dtb))

	}

#endif

	/*

	 * Align to 64K in attempt to eliminate holes before the

arch/mips/loongson64/lemote-2f/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct irqaction ip6_irqaction = { 
static struct irqaction cascade_irqaction = {

	.handler = no_action,

	.name = "cascade",

	.flags = IRQF_NO_THREAD,

	.flags = IRQF_NO_THREAD | IRQF_NO_SUSPEND,

};



void __init mach_init_irq(void)