Commit ad1d85ad authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents a06f9e52 53208e12

Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 58

SUBLEVEL = 59

EXTRAVERSION =

NAME = Petit Gorille
@@ -642,6 +642,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)

arch/mips/ath79/common.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ EXPORT_SYMBOL_GPL(ath79_ddr_ctrl_init); 


void ath79_ddr_wb_flush(u32 reg)

{

	void __iomem *flush_reg = ath79_ddr_wb_flush_base + reg;

	void __iomem *flush_reg = ath79_ddr_wb_flush_base + (reg * 4);



	/* Flush the DDR write buffer. */

	__raw_writel(0x1, flush_reg);

arch/mips/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -54,5 +54,5 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, 
	phys_addr_t size = resource_size(rsrc);



	*start = fixup_bigphys_addr(rsrc->start, size);

	*end = rsrc->start + size;

	*end = rsrc->start + size - 1;

}

arch/powerpc/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm( 
extern struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,

		unsigned long ua, unsigned long entries);

extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);

extern void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem);

#endif

arch/powerpc/kvm/book3s_64_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl, 
		/* This only handles v2 IOMMU type, v1 is handled via ioctl() */

		return H_TOO_HARD;



	if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, &hpa)))

	if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, tbl->it_page_shift, &hpa)))

		return H_HARDWARE;



	if (mm_iommu_mapped_inc(mem))