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

Commit 466787ae authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.188 (d4fff2d0) into msm-4.9 



* refs/heads/tmp-d4fff2d0:
  Linux 4.9.188
  x86, mm, gup: prevent get_page() race with munmap in paravirt guest
  objtool: Support GCC 9 cold subfunction naming scheme
  include/linux/module.h: copy __init/__exit attrs to init/cleanup_module
  Backport minimal compiler_attributes.h to support GCC 9
  eeprom: at24: make spd world-readable again
  coredump: fix race condition between collapse_huge_page() and core dumping
  infiniband: fix race condition between infiniband mlx4, mlx5 driver and core dumping
  coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping
  IB/mlx5: Fix RSS Toeplitz setup to be aligned with the HW specification
  xen/swiotlb: fix condition for calling xen_destroy_contiguous_region()
  drivers/perf: arm_pmu: Fix failure path in PM notifier
  s390/dasd: fix endless loop after read unit address configuration
  selinux: fix memory leak in policydb_init()
  gpiolib: fix incorrect IRQ requesting of an active-low lineevent
  mmc: dw_mmc: Fix occasional hang after tuning on eMMC
  Btrfs: fix incremental send failure after deduplication
  kbuild: initialize CLANG_FLAGS correctly in the top Makefile
  x86, boot: Remove multiple copy of static function sanitize_boot_params()
  x86/kvm: Don't call kvm_spurious_fault() from .fixup
  ipc/mqueue.c: only perform resource calculation if user valid
  drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
  uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers
  coda: fix build using bare-metal toolchain
  coda: add error handling for fget
  mm/cma.c: fail if fixed declaration can't be honored
  x86: math-emu: Hide clang warnings for 16-bit overflow
  x86/apic: Silence -Wtype-limits compiler warnings
  be2net: Signal that the device cannot transmit during reconfiguration
  ACPI: fix false-positive -Wuninitialized warning
  scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized
  ceph: return -ERANGE if virtual xattr value didn't fit in buffer
  ceph: fix improper use of smp_mb__before_atomic()
  btrfs: fix minimum number of chunk errors for DUP
  fs/adfs: super: fix use-after-free bug
  dmaengine: rcar-dmac: Reject zero-length slave DMA requests
  MIPS: lantiq: Fix bitfield masking
  kernel/module.c: Only return -EEXIST for modules that have finished loading
  ftrace: Enable trampoline when rec count returns back to one
  ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend
  ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work again
  ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200
  ARM: riscpc: fix DMA
  UPSTREAM: net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier
  binder: binder: fix possible UAF when freeing buffer
  Revert "ANDROID: Revert "f2fs: avoid out-of-range memory access""
  ANDROID: fix up 9p filesystem due to CFI non-upstream patches
  ANDROID: Revert "f2fs: avoid out-of-range memory access"

Change-Id: I479eae2ad70f75889e4a705648e493fc879bb6b9
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 79bbe9c8 d4fff2d0

Makefile

+3 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 187

SUBLEVEL = 188

EXTRAVERSION =

NAME = Roaring Lionus
@@ -405,6 +405,7 @@ KBUILD_AFLAGS_MODULE := -DMODULE 
KBUILD_CFLAGS_MODULE  := -DMODULE

KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

GCC_PLUGINS_CFLAGS :=

CLANG_FLAGS :=



# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
@@ -512,7 +513,7 @@ endif 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_FLAGS	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

CLANG_FLAGS	+= --target=$(notdir $(CLANG_TRIPLE:%-=%))

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)

$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

arch/arm/boot/dts/rk3288-veyron-mickey.dts

+0 −4
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ 
	};

};



&emmc {

	/delete-property/mmc-hs200-1_8v;

};



&i2c2 {

	status = "disabled";

};

arch/arm/boot/dts/rk3288-veyron-minnie.dts

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ 
	power-supply = <&backlight_regulator>;

};



&emmc {

	/delete-property/mmc-hs200-1_8v;

};



&gpio_keys {

	pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>;

arch/arm/boot/dts/rk3288.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		clock-frequency = <24000000>;

		arm,no-tick-in-suspend;

	};



	timer: timer@ff810000 {

arch/arm/mach-rpc/dma.c

+4 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id) 
	} while (1);



	idma->state = ~DMA_ST_AB;

	disable_irq(irq);

	disable_irq_nosync(irq);



	return IRQ_HANDLED;

}
@@ -174,6 +174,9 @@ static void iomd_enable_dma(unsigned int chan, dma_t *dma) 
				DMA_FROM_DEVICE : DMA_TO_DEVICE);

		}



		idma->dma_addr = idma->dma.sg->dma_address;

		idma->dma_len = idma->dma.sg->length;



		iomd_writeb(DMA_CR_C, dma_base + CR);

		idma->state = DMA_ST_AB;

	}