Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CSEP551
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Krishna Vinnakota
CSEP551
Commits
7472b2b4
Commit
7472b2b4
authored
14 years ago
by
Austin Clements
Browse files
Options
Downloads
Patches
Plain Diff
Fix too-long lines
parent
04be8fb2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
proc.c
+2
-1
2 additions, 1 deletion
proc.c
trap.c
+2
-1
2 additions, 1 deletion
trap.c
with
4 additions
and
2 deletions
proc.c
+
2
−
1
View file @
7472b2b4
...
...
@@ -120,7 +120,8 @@ userinit(void)
panic
(
"userinit: out of memory?"
);
if
(
!
allocuvm
(
p
->
pgdir
,
0x0
,
(
int
)
_binary_initcode_size
))
panic
(
"userinit: out of memory?"
);
inituvm
(
p
->
pgdir
,
0x0
,
_binary_initcode_start
,
(
int
)
_binary_initcode_size
);
inituvm
(
p
->
pgdir
,
0x0
,
_binary_initcode_start
,
(
int
)
_binary_initcode_size
);
p
->
sz
=
PGROUNDUP
((
int
)
_binary_initcode_size
);
memset
(
p
->
tf
,
0
,
sizeof
(
*
p
->
tf
));
p
->
tf
->
cs
=
(
SEG_UCODE
<<
3
)
|
DPL_USER
;
...
...
This diff is collapsed.
Click to expand it.
trap.c
+
2
−
1
View file @
7472b2b4
...
...
@@ -83,7 +83,8 @@ trap(struct trapframe *tf)
panic
(
"trap"
);
}
// In user space, assume process misbehaved.
cprintf
(
"pid %d %s: trap %d err %d on cpu %d eip 0x%x addr 0x%x--kill proc
\n
"
,
cprintf
(
"pid %d %s: trap %d err %d on cpu %d "
"eip 0x%x addr 0x%x--kill proc
\n
"
,
proc
->
pid
,
proc
->
name
,
tf
->
trapno
,
tf
->
err
,
cpu
->
id
,
tf
->
eip
,
rcr2
());
proc
->
killed
=
1
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment