Merge branch 'arch-ia64' into no-rebases (94b28de4) · Commits · 戴 / test

arch/ia64/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ config IA64
		select GENERIC_TIME_VSYSCALL_OLD
		select HAVE_MOD_ARCH_SPECIFIC
		select MODULES_USE_ELF_RELA
		select GENERIC_KERNEL_THREAD
		select GENERIC_KERNEL_EXECVE
		default y
		help
		The Itanium Processor Family is Intel's 64-bit successor to

arch/ia64/include/asm/processor.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -340,22 +340,6 @@ struct task_struct;
		*/
		#define release_thread(dead_task)

		/*
		* This is the mechanism for creating a new kernel thread.
		*
		* NOTE 1: Only a kernel-only process (ie the swapper or direct
		* descendants who haven't done an "execve()") should use this: it
		* will work within a system call from a "real" process, but the
		* process memory space will not be free'd until both the parent and
		* the child have exited.
		*
		* NOTE 2: This MUST NOT be an inlined function. Otherwise, we get
		* into trouble in init/main.c when the child thread returns to
		* do_basic_setup() and the timing is such that free_initmem() has
		* been called already.
		*/
		extern pid_t kernel_thread (int (fn)(void ), void *arg, unsigned long flags);

		/* Get wait channel for task P. */
		extern unsigned long get_wchan (struct task_struct *p);

arch/ia64/include/asm/unistd.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@

		#define __ARCH_WANT_SYS_RT_SIGACTION
		#define __ARCH_WANT_SYS_RT_SIGSUSPEND
		#define __ARCH_WANT_SYS_EXECVE

		#if !defined(__ASSEMBLY__) && !defined(ASSEMBLER)

arch/ia64/kernel/entry.S

+23 −16

Original line number	Diff line number	Diff line
		@@ -61,14 +61,13 @@ ENTRY(ia64_execve)
		* Allocate 8 input registers since ptrace() may clobber them
		*/
		.prologue ASM_UNW_PRLG_RP\|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
		alloc loc1=ar.pfs,8,2,4,0
		alloc loc1=ar.pfs,8,2,3,0
		mov loc0=rp
		.body
		mov out0=in0 // filename
		;; // stop bit between alloc and call
		mov out1=in1 // argv
		mov out2=in2 // envp
		add out3=16,sp // regs
		br.call.sptk.many rp=sys_execve
		.ret0:
		cmp4.ge p6,p7=r8,r0
		@@ -76,7 +75,6 @@ ENTRY(ia64_execve)
		sxt4 r8=r8 // return 64-bit result
		;;
		stf.spill [sp]=f0
		(p6) cmp.ne pKStk,pUStk=r0,r0 // a successful execve() lands us in user-mode...
		mov rp=loc0
		(p6) mov ar.pfs=r0 // clear ar.pfs on success
		(p7) br.ret.sptk.many rp
		@@ -484,19 +482,6 @@ GLOBAL_ENTRY(prefetch_stack)
		br.ret.sptk.many rp
		END(prefetch_stack)

		GLOBAL_ENTRY(kernel_execve)
		rum psr.ac
		mov r15=__NR_execve // put syscall number in place
		break __BREAK_SYSCALL
		br.ret.sptk.many rp
		END(kernel_execve)

		GLOBAL_ENTRY(clone)
		mov r15=__NR_clone // put syscall number in place
		break __BREAK_SYSCALL
		br.ret.sptk.many rp
		END(clone)

		/*
		* Invoke a system call, but do some tracing before and after the call.
		* We MUST preserve the current register frame throughout this routine
		@@ -600,6 +585,27 @@ GLOBAL_ENTRY(ia64_strace_leave_kernel)
		.ret4: br.cond.sptk ia64_leave_kernel
		END(ia64_strace_leave_kernel)

		ENTRY(call_payload)
		.prologue ASM_UNW_PRLG_RP\|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(0)
		/* call the kernel_thread payload; fn is in r4, arg - in r5 */
		alloc loc1=ar.pfs,0,3,1,0
		mov loc0=rp
		mov loc2=gp
		mov out0=r5 // arg
		ld8 r14 = [r4], 8 // fn.address
		;;
		mov b6 = r14
		ld8 gp = [r4] // fn.gp
		;;
		br.call.sptk.many rp=b6 // fn(arg)
		.ret12: mov gp=loc2
		mov rp=loc0
		mov ar.pfs=loc1
		/* ... and if it has returned, we are going to userland */
		cmp.ne pKStk,pUStk=r0,r0
		br.ret.sptk.many rp
		END(call_payload)

		GLOBAL_ENTRY(ia64_ret_from_clone)
		PT_REGS_UNWIND_INFO(0)
		{ /*
		@@ -616,6 +622,7 @@ GLOBAL_ENTRY(ia64_ret_from_clone)
		br.call.sptk.many rp=ia64_invoke_schedule_tail
		}
		.ret8:
		(pKStk) br.call.sptk.many rp=call_payload
		adds r2=TI_FLAGS+IA64_TASK_SIZE,r13
		;;
		ld4 r2=[r2]

arch/ia64/kernel/head.S

+0 −13

Original line number	Diff line number	Diff line
		@@ -1093,19 +1093,6 @@ GLOBAL_ENTRY(cycle_to_cputime)
		END(cycle_to_cputime)
		#endif /* CONFIG_VIRT_CPU_ACCOUNTING */

		GLOBAL_ENTRY(start_kernel_thread)
		.prologue
		.save rp, r0 // this is the end of the call-chain
		.body
		alloc r2 = ar.pfs, 0, 0, 2, 0
		mov out0 = r9
		mov out1 = r11;;
		br.call.sptk.many rp = kernel_thread_helper;;
		mov out0 = r8
		br.call.sptk.many rp = sys_exit;;
		1: br.sptk.few 1b // not reached
		END(start_kernel_thread)

		#ifdef CONFIG_IA64_BRL_EMU

		/*

Admin message