Merge "Merge android-4.4.165 (f34ff9e) into msm-4.4" (0b402f74) · Commits · e / devices / android_kernel_sony_msm8998

Makefile

+19 −8

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 163
		SUBLEVEL = 165
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -306,11 +306,6 @@ HOSTCXX = g++
		HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
		HOSTCXXFLAGS = -O2

		ifeq ($(shell $(HOSTCC) -v 2>&1 \| grep -c "clang version"), 1)
		HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
		-Wno-missing-field-initializers -fno-delete-null-pointer-checks
		endif

		# Decide whether to build built-in, modular, or both.
		# Normally, just do built-in.

		@@ -620,6 +615,22 @@ endif # $(dot-config)
		# Defaults to vmlinux, but the arch makefile usually adds further targets
		all: vmlinux

		ifeq ($(cc-name),clang)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
		CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR)
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
		endif
		ifneq ($(GCC_TOOLCHAIN),)
		CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
		endif
		KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
		KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
		KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
		KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
		endif

		# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
		# values of the respective KBUILD_* variables
		ARCH_CPPFLAGS :=
		@@ -742,11 +753,11 @@ KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
		else

		# These warnings generated too much noise in a regular build.
		# Use make W=1 to enable them (see scripts/Makefile.build)
		# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
		KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
		KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
		endif

		KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
		ifdef CONFIG_FRAME_POINTER
		KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
		else

arch/alpha/include/asm/termios.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -72,9 +72,15 @@
		})

		#define user_termios_to_kernel_termios(k, u) \
		copy_from_user(k, u, sizeof(struct termios))
		copy_from_user(k, u, sizeof(struct termios2))

		#define kernel_termios_to_user_termios(u, k) \
		copy_to_user(u, k, sizeof(struct termios2))

		#define user_termios_to_kernel_termios_1(k, u) \
		copy_from_user(k, u, sizeof(struct termios))

		#define kernel_termios_to_user_termios_1(u, k) \
		copy_to_user(u, k, sizeof(struct termios))

		#endif /* _ALPHA_TERMIOS_H */

arch/alpha/include/uapi/asm/ioctls.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,11 @@
		#define TCXONC _IO('t', 30)
		#define TCFLSH _IO('t', 31)

		#define TCGETS2 _IOR('T', 42, struct termios2)
		#define TCSETS2 _IOW('T', 43, struct termios2)
		#define TCSETSW2 _IOW('T', 44, struct termios2)
		#define TCSETSF2 _IOW('T', 45, struct termios2)

		#define TIOCSWINSZ _IOW('t', 103, struct winsize)
		#define TIOCGWINSZ _IOR('t', 104, struct winsize)
		#define TIOCSTART _IO('t', 110) /* start output, like ^Q */

arch/alpha/include/uapi/asm/termbits.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,19 @@ struct termios {
		speed_t c_ospeed; /* output speed */
		};

		/* Alpha has identical termios and termios2 */

		struct termios2 {
		tcflag_t c_iflag; /* input mode flags */
		tcflag_t c_oflag; /* output mode flags */
		tcflag_t c_cflag; /* control mode flags */
		tcflag_t c_lflag; /* local mode flags */
		cc_t c_cc[NCCS]; /* control characters */
		cc_t c_line; /* line discipline (== c_cc[19]) */
		speed_t c_ispeed; /* input speed */
		speed_t c_ospeed; /* output speed */
		};

		/* Alpha has matching termios and ktermios */

		struct ktermios {
		@@ -147,6 +160,7 @@ struct ktermios {
		#define B3000000 00034
		#define B3500000 00035
		#define B4000000 00036
		#define BOTHER 00037

		#define CSIZE 00001400
		#define CS5 00000000
		@@ -164,6 +178,9 @@ struct ktermios {
		#define CMSPAR 010000000000 /* mark or space (stick) parity */
		#define CRTSCTS 020000000000 /* flow control */

		#define CIBAUD 07600000
		#define IBSHIFT 16

		/* c_lflag bits */
		#define ISIG 0x00000080
		#define ICANON 0x00000100

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@

		sysmgr: sysmgr@ffd12000 {
		compatible = "altr,sys-mgr", "syscon";
		reg = <0xffd12000 0x1000>;
		reg = <0xffd12000 0x228>;
		};

		/* Local timer */