Commit 8c8666ff authored by popcornmix's avatar popcornmix
Browse files

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

parents 3dc96a25 ee13f7ed

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 67

SUBLEVEL = 68

EXTRAVERSION =

NAME = Petit Gorille
@@ -490,9 +490,13 @@ KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) 
endif



RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register

RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register

RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk

RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline

RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS

export RETPOLINE_VDSO_CFLAGS



ifeq ($(config-targets),1)

# ===========================================================================

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -336,6 +336,9 @@ config HAVE_ARCH_JUMP_LABEL 
config HAVE_RCU_TABLE_FREE

	bool



config HAVE_RCU_TABLE_INVALIDATE

	bool



config ARCH_HAVE_NMI_SAFE_CMPXCHG

	bool

arch/arc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ config ARC 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



config MIGHT_HAVE_PCI

	bool

arch/arc/include/asm/cache.h

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ 
})



/* Largest line length for either L1 or L2 is 128 bytes */

#define ARCH_DMA_MINALIGN      128

#define SMP_CACHE_BYTES		128

#define cache_line_size()	SMP_CACHE_BYTES

#define ARCH_DMA_MINALIGN	SMP_CACHE_BYTES



extern void arc_cache_init(void);

extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);

arch/arc/include/asm/delay.h

+3 −0
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ 
#ifndef __ASM_ARC_UDELAY_H

#define __ASM_ARC_UDELAY_H



#include <asm-generic/types.h>

#include <asm/param.h>		/* HZ */



extern unsigned long loops_per_jiffy;



static inline void __delay(unsigned long loops)

{

	__asm__ __volatile__(