|
Lines 714-722
Link Here
|
| 714 |
d->status = zombie; /* be careful about race conditions */ |
714 |
d->status = zombie; /* be careful about race conditions */ |
| 715 |
if (d->pid != -1) |
715 |
if (d->pid != -1) |
| 716 |
TerminateProcess (d->pid, SIGTERM); |
716 |
TerminateProcess (d->pid, SIGTERM); |
| 717 |
if (d->serverPid != -1) |
717 |
if (d->serverPid != -1) { |
| 718 |
TerminateProcess (d->serverPid, d->termSignal); |
718 |
TerminateProcess (d->serverPid, d->termSignal); |
| 719 |
else |
719 |
/* force kernel module reload after driver update; |
|
|
720 |
kernel module and X driver version need to match |
| 721 |
(Novell Bugzilla #219456) */ |
| 722 |
system("/sbin/rmmod nvidia fglrx"); |
| 723 |
} else |
| 720 |
RemoveDisplay (d); |
724 |
RemoveDisplay (d); |
| 721 |
} |
725 |
} |
| 722 |
|
726 |
|
|
Lines 730-735
Link Here
|
| 730 |
if (d->serverPid != -1 && (forceReserver || d->terminateServer)) |
734 |
if (d->serverPid != -1 && (forceReserver || d->terminateServer)) |
| 731 |
{ |
735 |
{ |
| 732 |
TerminateProcess (d->serverPid, d->termSignal); |
736 |
TerminateProcess (d->serverPid, d->termSignal); |
|
|
737 |
/* force kernel module reload after driver update; |
| 738 |
kernel module and X driver version need to match |
| 739 |
(Novell Bugzilla #219456) */ |
| 740 |
system("/sbin/rmmod nvidia fglrx"); |
| 733 |
d->status = phoenix; |
741 |
d->status = phoenix; |
| 734 |
} |
742 |
} |
| 735 |
else |
743 |
else |