Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c8b586 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] sched: cleanup, remove task_t, convert to struct task_struct 



cleanup: remove task_t and convert all the uses to struct task_struct. I
introduced it for the scheduler anno and it was a mistake.

Conversion was mostly scripted, the result was reviewed and all
secondary whitespace and style impact (if any) was fixed up by hand.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 48f24c4d

arch/alpha/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ do_sys_execve(char __user *ufilename, char __user * __user *argv, 
 */



unsigned long

thread_saved_pc(task_t *t)

thread_saved_pc(struct task_struct *t)

{

	unsigned long base = (unsigned long)task_stack_page(t);

	unsigned long fp, sp = task_thread_info(t)->pcb.ksp;

arch/ia64/kernel/mca.c

+5 −5
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ copy_reg(const u64 *fr, u64 fnat, u64 *tr, u64 *tnat) 
 */



static void

ia64_mca_modify_comm(const task_t *previous_current)

ia64_mca_modify_comm(const struct task_struct *previous_current)

{

	char *p, comm[sizeof(current->comm)];

	if (previous_current->pid)
@@ -709,7 +709,7 @@ ia64_mca_modify_comm(const task_t *previous_current) 
 * that we can do backtrace on the MCA/INIT handler code itself.

 */



static task_t *

static struct task_struct *

ia64_mca_modify_original_stack(struct pt_regs *regs,

		const struct switch_stack *sw,

		struct ia64_sal_os_state *sos,
@@ -719,7 +719,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs, 
	ia64_va va;

	extern char ia64_leave_kernel[];	/* Need asm address, not function descriptor */

	const pal_min_state_area_t *ms = sos->pal_min_state;

	task_t *previous_current;

	struct task_struct *previous_current;

	struct pt_regs *old_regs;

	struct switch_stack *old_sw;

	unsigned size = sizeof(struct pt_regs) +
@@ -1023,7 +1023,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, 
	pal_processor_state_info_t *psp = (pal_processor_state_info_t *)

		&sos->proc_state_param;

	int recover, cpu = smp_processor_id();

	task_t *previous_current;

	struct task_struct *previous_current;

	struct ia64_mca_notify_die nd =

		{ .sos = sos, .monarch_cpu = &monarch_cpu };
@@ -1352,7 +1352,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw, 
{

	static atomic_t slaves;

	static atomic_t monarchs;

	task_t *previous_current;

	struct task_struct *previous_current;

	int cpu = smp_processor_id();

	struct ia64_mca_notify_die nd =

		{ .sos = sos, .monarch_cpu = &monarch_cpu };

arch/ia64/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ extern void __devinit calibrate_delay (void); 
extern void start_ap (void);

extern unsigned long ia64_iobase;



task_t *task_for_booting_cpu;

struct task_struct *task_for_booting_cpu;



/*

 * State for each CPU

arch/mips/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ need_resched: 
#endif



FEXPORT(ret_from_fork)

	jal	schedule_tail		# a0 = task_t *prev

	jal	schedule_tail		# a0 = struct task_struct *prev



FEXPORT(syscall_exit)

	local_irq_disable		# make sure need_resched and

arch/mips/kernel/mips-mt.c

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ unsigned long mt_fpemul_threshold = 0; 
 * used in sys_sched_set/getaffinity() in kernel/sched.c, so

 * cloned here.

 */

static inline task_t *find_process_by_pid(pid_t pid)

static inline struct task_struct *find_process_by_pid(pid_t pid)

{

	return pid ? find_task_by_pid(pid) : current;

}
@@ -62,7 +62,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, 
	cpumask_t new_mask;

	cpumask_t effective_mask;

	int retval;

	task_t *p;

	struct task_struct *p;



	if (len < sizeof(new_mask))

		return -EINVAL;
@@ -127,7 +127,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, 
	unsigned int real_len;

	cpumask_t mask;

	int retval;

	task_t *p;

	struct task_struct *p;



	real_len = sizeof(mask);

	if (len < real_len)