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

Commit 66379a5b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.118 into android-3.18 



Changes in 3.18.118
	tracing: Fix double free of event_trigger_data
	tracing: Fix possible double free in event_enable_trigger_func()
	tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure
	tracing: Quiet gcc warning about maybe unused link variable
	ALSA: emu10k1: add error handling for snd_ctl_add
	ALSA: fm801: add error handling for snd_ctl_add
	mm: vmalloc: avoid racy handling of debugobjects in vunmap
	mm/slub.c: add __printf verification to slab_err()
	rtc: ensure rtc_set_alarm fails when alarms are not supported
	infiniband: fix a possible use-after-free bug
	hvc_opal: don't set tb_ticks_per_usec in udbg_init_opal_common()
	RDMA/mad: Convert BUG_ONs to error flows
	usbip: usbip_detach: Fix memory, udev context and udev leak
	perf/x86/intel/uncore: Correct fixed counter index check in generic code
	perf/x86/intel/uncore: Correct fixed counter index check for NHM
	ASoC: dpcm: fix BE dai not hw_free and shutdown
	mwifiex: handle race during mwifiex_usb_disconnect
	wlcore: sdio: check for valid platform device data before suspend
	PCI: Prevent sysfs disable of device while driver is attached
	ath: Add regulatory mapping for FCC3_ETSIC
	ath: Add regulatory mapping for ETSI8_WORLD
	ath: Add regulatory mapping for APL13_WORLD
	ath: Add regulatory mapping for APL2_FCCA
	ath: Add regulatory mapping for Uganda
	ath: Add regulatory mapping for Tanzania
	ath: Add regulatory mapping for Serbia
	ath: Add regulatory mapping for Bermuda
	ath: Add regulatory mapping for Bahamas
	powerpc/32: Add a missing include header
	powerpc/chrp/time: Make some functions static, add missing header include
	powerpc/powermac: Add missing prototype for note_bootable_part()
	powerpc/powermac: Mark variable x as unused
	powerpc/8xx: fix invalid register expression in head_8xx.S
	PCI: pciehp: Request control of native hotplug only if supported
	scsi: ufs: fix exception event handling
	ALSA: emu10k1: Rate-limit error messages about page errors
	regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
	md: fix NULL dereference of mddev->pers in remove_and_add_spares()
	media: smiapp: fix timeout checking in smiapp_read_nvm
	ALSA: usb-audio: Apply rate limit to warning messages in URB complete callback
	drm/radeon: fix mode_valid's return type
	powerpc/embedded6xx/hlwd-pic: Prevent interrupts from being handled by Starlet
	HID: i2c-hid: check if device is there before really probing
	tty: Fix data race in tty_insert_flip_string_fixed_flag
	libata: Fix command retry decision
	media: saa7164: Fix driver name in debug output
	s390/cpum_sf: Add data entry sizes to sampling trailer entry
	perf: fix invalid bit in diagnostic entry
	scsi: 3w-9xxx: fix a missing-check bug
	scsi: 3w-xxxx: fix a missing-check bug
	scsi: megaraid: silence a static checker bug
	bpf: fix references to free_bpf_prog_info() in comments
	media: siano: get rid of __le32/__le16 cast warnings
	ALSA: hda/ca0132: fix build failure when a local macro is defined
	drm/gma500: fix psb_intel_lvds_mode_valid()'s return type
	ipconfig: Correctly initialise ic_nameservers
	rsi: Fix 'invalid vdd' warning in mmc
	microblaze: Fix simpleImage format generation
	usb: hub: Don't wait for connect state at resume for powered-off ports
	crypto: authencesn - don't leak pointers to authenc keys
	crypto: authenc - don't leak pointers to authenc keys
	media: omap3isp: fix unbalanced dma_iommu_mapping
	media: si470x: fix __be16 annotations
	random: mix rdrand with entropy sent in from userspace
	squashfs: be more careful about metadata corruption
	NET: stmmac: align DMA stuff to largest cache line length
	xen-netfront: wait xenbus state change when load module manually
	tcp: do not force quickack when receiving out-of-order packets
	tcp: add max_quickacks param to tcp_incr_quickack and tcp_enter_quickack_mode
	tcp: do not aggressively quick ack after ECN events
	tcp: refactor tcp_ecn_check_ce to remove sk type cast
	tcp: add one more quick ack after after ECN events
	ipv4: remove BUG_ON() from fib_compute_spec_dst
	inet: frag: enforce memory limits earlier
	net: dsa: Do not suspend/resume closed slave_dev
	squashfs: more metadata hardening
	squashfs: more metadata hardenings
	can: ems_usb: Fix memory leak on ems_usb_disconnect()
	virtio_balloon: fix another race between migration and ballooning
	crypto: padlock-aes - Fix Nano workaround data corruption
	scsi: sg: fix minor memory leak in error path
	scsi: qla2xxx: Fix ISP recovery on unload
	scsi: qla2xxx: Return error when TMF returns
	ring_buffer: tracing: Inherit the tracing setting to next ring buffer
	jfs: Fix inconsistency between memory allocation and ea_buf->max_size
	Linux 3.18.118

Change-Id: I11249c323116a1c6d2dffe8a89158c31076d724c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0d4b8de1 830f9674

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 117

SUBLEVEL = 118

EXTRAVERSION =

NAME = Diseased Newt

arch/microblaze/boot/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -21,18 +21,20 @@ $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE 
quiet_cmd_cp = CP      $< $@$2

	cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)



quiet_cmd_strip = STRIP   $@

quiet_cmd_strip = STRIP   $< $@$2

	cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \

				-K _fdt_start vmlinux -o $@

				-K _fdt_start $< -o $@$2



UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)

UIMAGE_IN = $@

UIMAGE_OUT = $@.ub



$(obj)/simpleImage.%: vmlinux FORCE

	$(call if_changed,cp,.unstrip)

	$(call if_changed,objcopy)

	$(call if_changed,uimage)

	$(call if_changed,strip)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'

	$(call if_changed,strip,.strip)

	@echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')'





clean-files += simpleImage.*.unstrip linux.bin.ub

arch/powerpc/kernel/head_8xx.S

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ start_here: 
	tovirt(r6,r6)

	lis	r5, abatron_pteptrs@h

	ori	r5, r5, abatron_pteptrs@l

	stw	r5, 0xf0(r0)	/* Must match your Abatron config file */

	stw	r5, 0xf0(0)	/* Must match your Abatron config file */

	tophys(r5,r5)

	stw	r6, 0(r5)

arch/powerpc/kernel/pci_32.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/sched.h>

#include <linux/errno.h>

#include <linux/bootmem.h>

#include <linux/syscalls.h>

#include <linux/irq.h>

#include <linux/list.h>

#include <linux/of.h>

arch/powerpc/platforms/chrp/time.c

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <asm/sections.h>

#include <asm/time.h>



#include <platforms/chrp/chrp.h>



extern spinlock_t rtc_lock;



#define NVRAM_AS0  0x74
@@ -62,7 +64,7 @@ long __init chrp_time_init(void) 
	return 0;

}



int chrp_cmos_clock_read(int addr)

static int chrp_cmos_clock_read(int addr)

{

	if (nvram_as1 != 0)

		outb(addr>>8, nvram_as1);
@@ -70,7 +72,7 @@ int chrp_cmos_clock_read(int addr) 
	return (inb(nvram_data));

}



void chrp_cmos_clock_write(unsigned long val, int addr)

static void chrp_cmos_clock_write(unsigned long val, int addr)

{

	if (nvram_as1 != 0)

		outb(addr>>8, nvram_as1);