Merge commit 'v3.4' into x86/urgent (d13a822e) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/feature-removal-schedule.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -539,3 +539,13 @@ When: 3.6
		Why: setitimer is not returning -EFAULT if user pointer is NULL. This
		violates the spec.
		Who: Sasikantha Babu <sasikanth.v19@gmail.com>

		----------------------------

		What: V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls
		When: 3.7
		Why: The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated
		for about 4 years and they are not used by any mainline driver.
		There are newer controls (V4L2_CID_PAN, V4L2_CID_TILT) that provide
		similar functionality.
		Who: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>

+3 −0

Original line number	Diff line number	Diff line
		@@ -1968,7 +1968,9 @@ S: Maintained
		F: drivers/net/ethernet/ti/cpmac.c

		CPU FREQUENCY DRIVERS
		M: Rafael J. Wysocki <rjw@sisk.pl>
		L: cpufreq@vger.kernel.org
		L: linux-pm@vger.kernel.org
		S: Maintained
		F: drivers/cpufreq/
		F: include/linux/cpufreq.h
		@@ -4034,6 +4036,7 @@ F: Documentation/scsi/53c700.txt
		F: drivers/scsi/53c700*

		LED SUBSYSTEM
		M: Bryan Wu <bryan.wu@canonical.com>
		M: Richard Purdie <rpurdie@rpsys.net>
		S: Maintained
		F: drivers/leds/

+7 −4

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 4
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION =
		NAME = Saber-toothed Squirrel

		# DOCUMENTATION
		@@ -442,7 +442,7 @@ asm-generic:

		no-dot-config-targets := clean mrproper distclean \
		cscope gtags TAGS tags help %docs check% coccicheck \
		include/linux/version.h headers_% archheaders \
		include/linux/version.h headers_% archheaders archscripts \
		kernelversion %src-pkg

		config-targets := 0
		@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
		include/config/auto.conf
		$(cmd_crmodverdir)

		archprepare: archheaders prepare1 scripts_basic
		archprepare: archheaders archscripts prepare1 scripts_basic

		prepare0: archprepare FORCE
		$(Q)$(MAKE) $(build)=.
		@@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
		PHONY += archheaders
		archheaders:

		PHONY += archscripts
		archscripts:

		PHONY += __headers
		__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE
		__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE
		$(Q)$(MAKE) $(build)=scripts build_unifdef

		PHONY += headers_install_all

+9 −15

Original line number	Diff line number	Diff line
		@@ -906,27 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
		return ret;
		}

		#ifdef __ARMEB__
		#define AUDIT_ARCH_NR AUDIT_ARCH_ARMEB
		#else
		#define AUDIT_ARCH_NR AUDIT_ARCH_ARM
		#endif

		asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
		{
		unsigned long ip;

		/*
		* Save IP. IP is used to denote syscall entry/exit:
		* IP = 0 -> entry, = 1 -> exit
		*/
		ip = regs->ARM_ip;
		regs->ARM_ip = why;

		if (!ip)
		if (why)
		audit_syscall_exit(regs);
		else
		audit_syscall_entry(AUDIT_ARCH_NR, scno, regs->ARM_r0,
		audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0,
		regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);

		if (!test_thread_flag(TIF_SYSCALL_TRACE))
		@@ -936,6 +923,13 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)

		current_thread_info()->syscall = scno;

		/*
		* IP is used to denote syscall entry/exit:
		* IP = 0 -> entry, =1 -> exit
		*/
		ip = regs->ARM_ip;
		regs->ARM_ip = why;

		/* the 0x80 provides a way for the tracing parent to distinguish
		between a syscall stop and SIGTRAP delivery */
		ptrace_notify(SIGTRAP \| ((current->ptrace & PT_TRACESYSGOOD)

+2 −2

Original line number	Diff line number	Diff line
		@@ -251,8 +251,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
		struct mm_struct *mm = &init_mm;
		unsigned int cpu = smp_processor_id();

		printk("CPU%u: Booted secondary processor\n", cpu);

		/*
		* All kernel threads share the same mm context; grab a
		* reference and switch to it.
		@@ -264,6 +262,8 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
		enter_lazy_tlb(mm, current);
		local_flush_tlb_all();

		printk("CPU%u: Booted secondary processor\n", cpu);

		cpu_init();
		preempt_disable();
		trace_hardirqs_off();