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

Commit 6a90545e authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.46' into linux-linaro-lsk-v3.18 

 This is the 3.18.46 stable release
parents 41a1275c 1e20e732

Documentation/arm/CCN.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Example of perf tool use: 
/ # perf list | grep ccn

  ccn/cycles/                                        [Kernel PMU event]

<...>

  ccn/xp_valid_flit/                                 [Kernel PMU event]

  ccn/xp_valid_flit,xp=?,port=?,vc=?,dir=?/          [Kernel PMU event]

<...>



/ # perf stat -C 0 -e ccn/cycles/,ccn/xp_valid_flit,xp=1,port=0,vc=1,dir=1/ \

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 45

SUBLEVEL = 46

EXTRAVERSION =

NAME = Diseased Newt

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) 
/* The ARM override for dma_max_pfn() */

static inline unsigned long dma_max_pfn(struct device *dev)

{

	return PHYS_PFN_OFFSET + dma_to_pfn(dev, *dev->dma_mask);

	return dma_to_pfn(dev, *dev->dma_mask);

}

#define dma_max_pfn(dev) dma_max_pfn(dev)

arch/x86/include/asm/tlbflush.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate); 
/* Initialize cr4 shadow for this CPU. */

static inline void cr4_init_shadow(void)

{

	this_cpu_write(cpu_tlbstate.cr4, __read_cr4());

	this_cpu_write(cpu_tlbstate.cr4, __read_cr4_safe());

}



/* Set in this cpu's CR4. */

arch/x86/purgatory/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ targets += purgatory.ro 


KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large

KBUILD_CFLAGS += -m$(BITS)

KBUILD_CFLAGS += $(call cc-option,-fno-PIE)



$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE

		$(call if_changed,ld)