Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (6026e043) · Commits · e / devices / android_kernel_teracube_emerald

Makefile

+8 −7

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 13
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Fearless Coyote

		# DOCUMENTATION
		@@ -396,7 +396,7 @@ LINUXINCLUDE := \
		KBUILD_CPPFLAGS := -D__KERNEL__

		KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common \
		-fno-strict-aliasing -fno-common -fshort-wchar \
		-Werror-implicit-function-declaration \
		-Wno-format-security \
		-std=gnu89 $(call cc-option,-fno-PIE)
		@@ -442,7 +442,7 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
		# ===========================================================================
		# Rules shared between *config targets and build targets

		# Basic helpers built in scripts/
		# Basic helpers built in scripts/basic/
		PHONY += scripts_basic
		scripts_basic:
		$(Q)$(MAKE) $(build)=scripts/basic
		@@ -505,7 +505,7 @@ ifeq ($(KBUILD_EXTMOD),)
		endif
		endif
		endif
		# install and module_install need also be processed one by one
		# install and modules_install need also be processed one by one
		ifneq ($(filter install,$(MAKECMDGOALS)),)
		ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
		mixed-targets := 1
		@@ -964,7 +964,7 @@ export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-
		export KBUILD_VMLINUX_LIBS := $(libs-y1)
		export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
		export LDFLAGS_vmlinux
		# used by scripts/pacmage/Makefile
		# used by scripts/package/Makefile
		export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)

		vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS)
		@@ -1184,6 +1184,7 @@ PHONY += kselftest
		kselftest:
		$(Q)$(MAKE) -C tools/testing/selftests run_tests

		PHONY += kselftest-clean
		kselftest-clean:
		$(Q)$(MAKE) -C tools/testing/selftests clean

arch/alpha/include/asm/io.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,7 @@ static inline void __iomem * ioremap_nocache(unsigned long offset,
		return ioremap(offset, size);
		}

		#define ioremap_wc ioremap_nocache
		#define ioremap_uc ioremap_nocache

		static inline void iounmap(volatile void __iomem *addr)

arch/alpha/include/asm/types.h

+1 −1

Original line number	Diff line number	Diff line
		#ifndef _ALPHA_TYPES_H
		#define _ALPHA_TYPES_H

		#include <asm-generic/int-ll64.h>
		#include <uapi/asm/types.h>

		#endif /* _ALPHA_TYPES_H */

arch/alpha/include/asm/unistd.h

+1 −1

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

		#include <uapi/asm/unistd.h>

		#define NR_SYSCALLS 514
		#define NR_SYSCALLS 523

		#define __ARCH_WANT_OLD_READDIR
		#define __ARCH_WANT_STAT64

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -9,8 +9,18 @@
		* need to be careful to avoid a name clashes.
		*/

		#ifndef __KERNEL__
		/*
		* This is here because we used to use l64 for alpha
		* and we don't want to impact user mode with our change to ll64
		* in the kernel.
		*
		* However, some user programs are fine with this. They can
		* flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.
		*/
		#if !defined(__SANE_USERSPACE_TYPES__) && !defined(__KERNEL__)
		#include <asm-generic/int-l64.h>
		#else
		#include <asm-generic/int-ll64.h>
		#endif

		#endif /* _UAPI_ALPHA_TYPES_H */