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

Commit 6612538c authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: clean up process_32/64.c 



White space and coding style clean up.
Make process_32/64.c similar.

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3c2362e6

arch/x86/kernel/process_64.c

+98 −99
Original line number Diff line number Diff line
@@ -19,19 +19,19 @@ 
#include <linux/cpu.h>

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/fs.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/elfcore.h>

#include <linux/smp.h>

#include <linux/slab.h>

#include <linux/user.h>

#include <linux/module.h>

#include <linux/a.out.h>

#include <linux/interrupt.h>

#include <linux/utsname.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/ptrace.h>

#include <linux/utsname.h>

#include <linux/random.h>

#include <linux/notifier.h>

#include <linux/kprobes.h>
@@ -135,48 +135,6 @@ static void poll_idle (void) 
	cpu_relax();

}



static void do_nothing(void *unused)

{

}



void cpu_idle_wait(void)

{

	unsigned int cpu, this_cpu = get_cpu();

	cpumask_t map, tmp = current->cpus_allowed;



	set_cpus_allowed(current, cpumask_of_cpu(this_cpu));

	put_cpu();



	cpus_clear(map);

	for_each_online_cpu(cpu) {

		per_cpu(cpu_idle_state, cpu) = 1;

		cpu_set(cpu, map);

	}



	__get_cpu_var(cpu_idle_state) = 0;



	wmb();

	do {

		ssleep(1);

		for_each_online_cpu(cpu) {

			if (cpu_isset(cpu, map) &&

					!per_cpu(cpu_idle_state, cpu))

				cpu_clear(cpu, map);

		}

		cpus_and(map, map, cpu_online_map);

		/*

		 * We waited 1 sec, if a CPU still did not call idle

		 * it may be because it is in idle and not waking up

		 * because it has nothing to do.

		 * Give all the remaining CPUS a kick.

		 */

		smp_call_function_mask(map, do_nothing, 0, 0);

	} while (!cpus_empty(map));



	set_cpus_allowed(current, tmp);

}

EXPORT_SYMBOL_GPL(cpu_idle_wait);



#ifdef CONFIG_HOTPLUG_CPU

DECLARE_PER_CPU(int, cpu_state);
@@ -247,6 +205,47 @@ void cpu_idle(void) 
	}

}



static void do_nothing(void *unused)

{

}



void cpu_idle_wait(void)

{

	unsigned int cpu, this_cpu = get_cpu();

	cpumask_t map, tmp = current->cpus_allowed;



	set_cpus_allowed(current, cpumask_of_cpu(this_cpu));

	put_cpu();



	cpus_clear(map);

	for_each_online_cpu(cpu) {

		per_cpu(cpu_idle_state, cpu) = 1;

		cpu_set(cpu, map);

	}



	__get_cpu_var(cpu_idle_state) = 0;



	wmb();

	do {

		ssleep(1);

		for_each_online_cpu(cpu) {

			if (cpu_isset(cpu, map) && !per_cpu(cpu_idle_state, cpu))

				cpu_clear(cpu, map);

		}

		cpus_and(map, map, cpu_online_map);

		/*

		 * We waited 1 sec, if a CPU still did not call idle

		 * it may be because it is in idle and not waking up

		 * because it has nothing to do.

		 * Give all the remaining CPUS a kick.

		 */

		smp_call_function_mask(map, do_nothing, 0, 0);

	} while (!cpus_empty(map));



	set_cpus_allowed(current, tmp);

}

EXPORT_SYMBOL_GPL(cpu_idle_wait);



/*

 * This uses new MONITOR/MWAIT instructions on P4 processors with PNI,

 * which can obviate IPI to trigger checking of need_resched.
@@ -546,6 +545,24 @@ out: 
 */

#define loaddebug(thread, r) set_debugreg(thread->debugreg ## r, r)



/*

 * Capture the user space registers if the task is not running (in user space)

 */

int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)

{

	struct pt_regs *pp, ptregs;



	pp = task_pt_regs(tsk);



	ptregs = *pp;

	ptregs.cs &= 0xffff;

	ptregs.ss &= 0xffff;



	elf_core_copy_regs(regs, &ptregs);



	return 1;

}



static inline void __switch_to_xtra(struct task_struct *prev_p,

				    struct task_struct *next_p,

				    struct tss_struct *tss)
@@ -885,24 +902,6 @@ long sys_arch_prctl(int code, unsigned long addr) 
	return do_arch_prctl(current, code, addr);

}



/* 

 * Capture the user space registers if the task is not running (in user space)

 */

int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)

{

	struct pt_regs *pp, ptregs;



	pp = task_pt_regs(tsk);



	ptregs = *pp; 

	ptregs.cs &= 0xffff;

	ptregs.ss &= 0xffff;



	elf_core_copy_regs(regs, &ptregs);

 

	return 1;

}



unsigned long arch_align_stack(unsigned long sp)

{

	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)

arch/x86/kernel/process_32.c

+3 −3

File changed.

Contains only whitespace changes.