Commit 32535bd5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'v3.5-for-usb' of... 

Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into usb-next
parents 0b623f87 3a36dd06

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1974,7 +1974,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
@@ -4040,6 +4042,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/

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/kernel/ptrace.c

+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)

arch/arm/kernel/smp.c

+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();

arch/arm/kernel/sys_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int kernel_execve(const char *filename, 
		  "Ir" (THREAD_START_SP - sizeof(regs)),

		  "r" (&regs),

		  "Ir" (sizeof(regs))

		: "r0", "r1", "r2", "r3", "ip", "lr", "memory");

		: "r0", "r1", "r2", "r3", "r8", "r9", "ip", "lr", "memory");



 out:

	return ret;