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
vserver 1.9.3
[linux-2.6.git]
/
arch
/
h8300
/
kernel
/
process.c
diff --git
a/arch/h8300/kernel/process.c
b/arch/h8300/kernel/process.c
index
afe7417
..
134aec1
100644
(file)
--- a/
arch/h8300/kernel/process.c
+++ b/
arch/h8300/kernel/process.c
@@
-55,9
+55,9
@@
void default_idle(void)
{
while(1) {
if (need_resched()) {
{
while(1) {
if (need_resched()) {
-
sti
();
+
local_irq_enable
();
__asm__("sleep");
__asm__("sleep");
-
cli
();
+
local_irq_disable
();
}
schedule();
}
}
schedule();
}
@@
-112,14
+112,13
@@
EXPORT_SYMBOL(machine_power_off);
void show_regs(struct pt_regs * regs)
{
void show_regs(struct pt_regs * regs)
{
- printk("\n");
- printk("PC: %08lx Status: %02x\n",
+ printk("\nPC: %08lx Status: %02x",
regs->pc, regs->ccr);
regs->pc, regs->ccr);
- printk("
ORIG_ER0: %08lx ER0: %08lx ER1: %08lx\n
",
+ printk("
\nORIG_ER0: %08lx ER0: %08lx ER1: %08lx
",
regs->orig_er0, regs->er0, regs->er1);
regs->orig_er0, regs->er0, regs->er1);
- printk("
ER2: %08lx ER3: %08lx ER4: %08lx ER5: %08lx\n
",
+ printk("
\nER2: %08lx ER3: %08lx ER4: %08lx ER5: %08lx
",
regs->er2, regs->er3, regs->er4, regs->er5);
regs->er2, regs->er3, regs->er4, regs->er5);
- printk("ER6' %08lx ",regs->er6);
+ printk("
\n
ER6' %08lx ",regs->er6);
if (user_mode(regs))
printk("USP: %08lx\n", rdusp());
else
if (user_mode(regs))
printk("USP: %08lx\n", rdusp());
else
@@
-190,7
+189,7
@@
asmlinkage int h8300_clone(struct pt_regs *regs)
newsp = regs->er2;
if (!newsp)
newsp = rdusp();
newsp = regs->er2;
if (!newsp)
newsp = rdusp();
- return do_fork(clone_flags
& ~CLONE_IDLETASK
, newsp, regs, 0, NULL, NULL);
+ return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
}
}
@@
-261,12
+260,6
@@
out:
return error;
}
return error;
}
-/*
- * These bracket the sleeping functions..
- */
-#define first_sched ((unsigned long) scheduling_functions_start_here)
-#define last_sched ((unsigned long) scheduling_functions_end_here)
-
unsigned long thread_saved_pc(struct task_struct *tsk)
{
return ((struct pt_regs *)tsk->thread.esp0)->pc;
unsigned long thread_saved_pc(struct task_struct *tsk)
{
return ((struct pt_regs *)tsk->thread.esp0)->pc;
@@
-287,7
+280,7
@@
unsigned long get_wchan(struct task_struct *p)
fp >= 8184+stack_page)
return 0;
pc = ((unsigned long *)fp)[1];
fp >= 8184+stack_page)
return 0;
pc = ((unsigned long *)fp)[1];
- if (
pc < first_sched || pc >= last_sched
)
+ if (
!in_sched_functions(pc)
)
return pc;
fp = *(unsigned long *) fp;
} while (count++ < 16);
return pc;
fp = *(unsigned long *) fp;
} while (count++ < 16);