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

Unverified Commit 690d8622 authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #50 from derfelot/lineage-18.1 

[lineage-18.1] Kernel 4.4.293
parents 378fb240 6257baeb

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 291

SUBLEVEL = 293

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/Makefile

+11 −11
Original line number Diff line number Diff line
@@ -66,15 +66,15 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra) 
# Note that GCC does not numerically define an architecture version

# macro, but instead defines a whole series of macros which makes

# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v7M)	=-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m

arch-$(CONFIG_CPU_32v7)		=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)

arch-$(CONFIG_CPU_32v6)		=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)

arch-$(CONFIG_CPU_32v7M)	=-D__LINUX_ARM_ARCH__=7 -march=armv7-m

arch-$(CONFIG_CPU_32v7)		=-D__LINUX_ARM_ARCH__=7 -march=armv7-a

arch-$(CONFIG_CPU_32v6)		=-D__LINUX_ARM_ARCH__=6 -march=armv6

# Only override the compiler option if ARMv6. The ARMv6K extensions are

# always available in ARMv7

ifeq ($(CONFIG_CPU_32v6),y)

arch-$(CONFIG_CPU_32v6K)	=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)

arch-$(CONFIG_CPU_32v6K)	=-D__LINUX_ARM_ARCH__=6 -march=armv6k

endif

arch-$(CONFIG_CPU_32v5)		=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)

arch-$(CONFIG_CPU_32v5)		=-D__LINUX_ARM_ARCH__=5 -march=armv5te

arch-$(CONFIG_CPU_32v4T)	=-D__LINUX_ARM_ARCH__=4 -march=armv4t

arch-$(CONFIG_CPU_32v4)		=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v3)		=-D__LINUX_ARM_ARCH__=3 -march=armv3
@@ -88,7 +88,7 @@ tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi 
tune-$(CONFIG_CPU_ARM740T)	=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM9TDMI)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM940T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM946E)	=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)

tune-$(CONFIG_CPU_ARM946E)	=-mtune=arm9e

tune-$(CONFIG_CPU_ARM920T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM922T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM925T)	=-mtune=arm9tdmi
@@ -96,11 +96,11 @@ tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi 
tune-$(CONFIG_CPU_FA526)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_SA110)	=-mtune=strongarm110

tune-$(CONFIG_CPU_SA1100)	=-mtune=strongarm1100

tune-$(CONFIG_CPU_XSCALE)	=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale

tune-$(CONFIG_CPU_XSC3)		=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale

tune-$(CONFIG_CPU_FEROCEON)	=$(call cc-option,-mtune=marvell-f,-mtune=xscale)

tune-$(CONFIG_CPU_V6)		=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)

tune-$(CONFIG_CPU_V6K)		=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)

tune-$(CONFIG_CPU_XSCALE)	=-mtune=xscale

tune-$(CONFIG_CPU_XSC3)		=-mtune=xscale

tune-$(CONFIG_CPU_FEROCEON)	=-mtune=xscale

tune-$(CONFIG_CPU_V6)		=-mtune=arm1136j-s

tune-$(CONFIG_CPU_V6K)		=-mtune=arm1136j-s



# Evaluate tune cc-option calls now

tune-y := $(tune-y)

arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		compatible = "smsc,lan9221","smsc,lan9115";

		bank-width = <2>;



		gpmc,mux-add-data;

		gpmc,mux-add-data = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <42>;

		gpmc,cs-wr-off-ns = <36>;

arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
		compatible = "smsc,lan9221","smsc,lan9115";

		bank-width = <2>;



		gpmc,mux-add-data;

		gpmc,mux-add-data = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <42>;

		gpmc,cs-wr-off-ns = <36>;

arch/arm/kernel/stacktrace.c

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ int notrace unwind_frame(struct stackframe *frame) 


	frame->sp = frame->fp;

	frame->fp = *(unsigned long *)(fp);

	frame->pc = frame->lr;

	frame->lr = *(unsigned long *)(fp + 4);

	frame->pc = *(unsigned long *)(fp + 4);

#else

	/* check current frame pointer is within bounds */

	if (fp < low + 12 || fp > high - 4)