Commit 4da38fc7 authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/sfr
parents 90a252f2 28a59cb0
...@@ -514,6 +514,10 @@ asmlinkage void do_debug(struct pt_regs * regs, long error_code) ...@@ -514,6 +514,10 @@ asmlinkage void do_debug(struct pt_regs * regs, long error_code)
__asm__ __volatile__("movl %%db6,%0" : "=r" (condition)); __asm__ __volatile__("movl %%db6,%0" : "=r" (condition));
/* It's safe to allow irq's after DR6 has been saved */
if (regs->eflags & X86_EFLAGS_IF)
local_irq_enable();
/* Mask out spurious debug traps due to lazy DR7 setting */ /* Mask out spurious debug traps due to lazy DR7 setting */
if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) { if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {
if (!tsk->thread.debugreg[7]) if (!tsk->thread.debugreg[7])
...@@ -831,7 +835,7 @@ void __init trap_init(void) ...@@ -831,7 +835,7 @@ void __init trap_init(void)
#endif #endif
set_trap_gate(0,&divide_error); set_trap_gate(0,&divide_error);
set_trap_gate(1,&debug); set_intr_gate(1,&debug);
set_intr_gate(2,&nmi); set_intr_gate(2,&nmi);
set_system_gate(3,&int3); /* int3-5 can be called from all */ set_system_gate(3,&int3); /* int3-5 can be called from all */
set_system_gate(4,&overflow); set_system_gate(4,&overflow);
......
...@@ -126,8 +126,8 @@ static const char *task_state_array[] = { ...@@ -126,8 +126,8 @@ static const char *task_state_array[] = {
"R (running)", /* 0 */ "R (running)", /* 0 */
"S (sleeping)", /* 1 */ "S (sleeping)", /* 1 */
"D (disk sleep)", /* 2 */ "D (disk sleep)", /* 2 */
"T (stopped)", /* 8 */ "T (stopped)", /* 4 */
"Z (zombie)", /* 4 */ "Z (zombie)", /* 8 */
"X (dead)" /* 16 */ "X (dead)" /* 16 */
}; };
......
...@@ -781,7 +781,7 @@ do_group_exit(int exit_code) ...@@ -781,7 +781,7 @@ do_group_exit(int exit_code)
* wait4()-ing process will get the correct exit code - even if this * wait4()-ing process will get the correct exit code - even if this
* thread is not the thread group leader. * thread is not the thread group leader.
*/ */
asmlinkage long sys_exit_group(int error_code) asmlinkage void sys_exit_group(int error_code)
{ {
do_group_exit((error_code & 0xff) << 8); do_group_exit((error_code & 0xff) << 8);
} }
......
...@@ -2037,7 +2037,7 @@ static void show_task(task_t * p) ...@@ -2037,7 +2037,7 @@ static void show_task(task_t * p)
unsigned long free = 0; unsigned long free = 0;
task_t *relative; task_t *relative;
int state; int state;
static const char * stat_nam[] = { "R", "S", "D", "Z", "T", "W" }; static const char * stat_nam[] = { "R", "S", "D", "T", "Z", "W" };
printk("%-13.13s ", p->comm); printk("%-13.13s ", p->comm);
state = p->state ? __ffs(p->state) + 1 : 0; state = p->state ? __ffs(p->state) + 1 : 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment