Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
4da38fc7
Commit
4da38fc7
authored
Feb 11, 2003
by
Anton Blanchard
Browse files
Options
Browse Files
Download
Plain Diff
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/sfr
parents
90a252f2
28a59cb0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
arch/i386/kernel/traps.c
arch/i386/kernel/traps.c
+5
-1
fs/proc/array.c
fs/proc/array.c
+2
-2
kernel/exit.c
kernel/exit.c
+1
-1
kernel/sched.c
kernel/sched.c
+1
-1
No files found.
arch/i386/kernel/traps.c
View file @
4da38fc7
...
...
@@ -514,6 +514,10 @@ asmlinkage void do_debug(struct pt_regs * regs, long error_code)
__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 */
if
(
condition
&
(
DR_TRAP0
|
DR_TRAP1
|
DR_TRAP2
|
DR_TRAP3
))
{
if
(
!
tsk
->
thread
.
debugreg
[
7
])
...
...
@@ -831,7 +835,7 @@ void __init trap_init(void)
#endif
set_trap_gate
(
0
,
&
divide_error
);
set_
trap
_gate
(
1
,
&
debug
);
set_
intr
_gate
(
1
,
&
debug
);
set_intr_gate
(
2
,
&
nmi
);
set_system_gate
(
3
,
&
int3
);
/* int3-5 can be called from all */
set_system_gate
(
4
,
&
overflow
);
...
...
fs/proc/array.c
View file @
4da38fc7
...
...
@@ -126,8 +126,8 @@ static const char *task_state_array[] = {
"R (running)"
,
/* 0 */
"S (sleeping)"
,
/* 1 */
"D (disk sleep)"
,
/* 2 */
"T (stopped)"
,
/*
8
*/
"Z (zombie)"
,
/*
4
*/
"T (stopped)"
,
/*
4
*/
"Z (zombie)"
,
/*
8
*/
"X (dead)"
/* 16 */
};
...
...
kernel/exit.c
View file @
4da38fc7
...
...
@@ -781,7 +781,7 @@ do_group_exit(int exit_code)
* wait4()-ing process will get the correct exit code - even if this
* 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
);
}
...
...
kernel/sched.c
View file @
4da38fc7
...
...
@@ -2037,7 +2037,7 @@ static void show_task(task_t * p)
unsigned
long
free
=
0
;
task_t
*
relative
;
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
);
state
=
p
->
state
?
__ffs
(
p
->
state
)
+
1
:
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment