Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44439
b: refs/heads/master
c: 3dfcaf1
h: refs/heads/master
i:
  44437: 7cfceef
  44435: 2f883a2
  44431: 70b3ea0
v: v3
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Dec 13, 2006
1 parent 9ed119e commit c98e0fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f8442edfb214908e9c6ca1142bf882c9bc364e5
refs/heads/master: 3dfcaf16135150d0f025047a7525664a41bb2adf
6 changes: 3 additions & 3 deletions trunk/drivers/char/vt_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ static void complete_change_console(struct vc_data *vc)
switch_screen(vc);

/*
* This can't appear below a successful kill_proc(). If it did,
* This can't appear below a successful kill_pid(). If it did,
* then the *blank_screen operation could occur while X, having
* received acqsig, is waking up on another processor. This
* condition can lead to overlapping accesses to the VGA range
Expand All @@ -1110,7 +1110,7 @@ static void complete_change_console(struct vc_data *vc)
*/
if (vc->vt_mode.mode == VT_PROCESS) {
/*
* Send the signal as privileged - kill_proc() will
* Send the signal as privileged - kill_pid() will
* tell us if the process has gone or something else
* is awry
*/
Expand Down Expand Up @@ -1170,7 +1170,7 @@ void change_console(struct vc_data *new_vc)
vc = vc_cons[fg_console].d;
if (vc->vt_mode.mode == VT_PROCESS) {
/*
* Send the signal as privileged - kill_proc() will
* Send the signal as privileged - kill_pid() will
* tell us if the process has gone or something else
* is awry
*/
Expand Down

0 comments on commit c98e0fb

Please sign in to comment.