git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
m68k
/
kernel
/
process.c
diff --git
a/arch/m68k/kernel/process.c
b/arch/m68k/kernel/process.c
index
93b043e
..
33648ef
100644
(file)
--- a/
arch/m68k/kernel/process.c
+++ b/
arch/m68k/kernel/process.c
@@
-77,7
+77,7
@@
unsigned long thread_saved_pc(struct task_struct *tsk)
/*
* The idle loop on an m68k..
*/
/*
* The idle loop on an m68k..
*/
-void default_idle(void)
+
static
void default_idle(void)
{
if (!need_resched())
#if defined(MACH_ATARI_ONLY) && !defined(CONFIG_HADES)
{
if (!need_resched())
#if defined(MACH_ATARI_ONLY) && !defined(CONFIG_HADES)
@@
-102,7
+102,9
@@
void cpu_idle(void)
while (1) {
while (!need_resched())
idle();
while (1) {
while (!need_resched())
idle();
+ preempt_enable_no_resched();
schedule();
schedule();
+ preempt_disable();
}
}
}
}
@@
-113,8
+115,6
@@
void machine_restart(char * __unused)
for (;;);
}
for (;;);
}
-EXPORT_SYMBOL(machine_restart);
-
void machine_halt(void)
{
if (mach_halt)
void machine_halt(void)
{
if (mach_halt)
@@
-122,8
+122,6
@@
void machine_halt(void)
for (;;);
}
for (;;);
}
-EXPORT_SYMBOL(machine_halt);
-
void machine_power_off(void)
{
if (mach_power_off)
void machine_power_off(void)
{
if (mach_power_off)
@@
-131,7
+129,8
@@
void machine_power_off(void)
for (;;);
}
for (;;);
}
-EXPORT_SYMBOL(machine_power_off);
+void (*pm_power_off)(void) = machine_power_off;
+EXPORT_SYMBOL(pm_power_off);
void show_regs(struct pt_regs * regs)
{
void show_regs(struct pt_regs * regs)
{
@@
-242,10
+241,9
@@
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
{
struct pt_regs * childregs;
struct switch_stack * childstack, *stack;
{
struct pt_regs * childregs;
struct switch_stack * childstack, *stack;
- unsigned long
stack_offset,
*retp;
+ unsigned long *retp;
- stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
- childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset);
+ childregs = (struct pt_regs *) (task_stack_page(p) + THREAD_SIZE) - 1;
*childregs = *regs;
childregs->d0 = 0;
*childregs = *regs;
childregs->d0 = 0;
@@
-390,7
+388,7
@@
unsigned long get_wchan(struct task_struct *p)
if (!p || p == current || p->state == TASK_RUNNING)
return 0;
if (!p || p == current || p->state == TASK_RUNNING)
return 0;
- stack_page = (unsigned long)
(p->thread_info
);
+ stack_page = (unsigned long)
task_stack_page(p
);
fp = ((struct switch_stack *)p->thread.ksp)->a6;
do {
if (fp < stack_page+sizeof(struct thread_info) ||
fp = ((struct switch_stack *)p->thread.ksp)->a6;
do {
if (fp < stack_page+sizeof(struct thread_info) ||