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
Kirill Smelkov
linux
Commits
c9b0864a
Commit
c9b0864a
authored
Sep 19, 2002
by
Linus Torvalds
Committed by
Linus Torvalds
Sep 19, 2002
Browse files
Options
Browse Files
Download
Plain Diff
Merge home:v2.5/linux into kiwi.transmeta.com:/home/torvalds/v2.5/linux
parents
28fb8067
06f240e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
kernel/sys.c
kernel/sys.c
+3
-2
No files found.
kernel/sys.c
View file @
c9b0864a
...
@@ -412,9 +412,10 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void * arg)
...
@@ -412,9 +412,10 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void * arg)
#ifdef CONFIG_SOFTWARE_SUSPEND
#ifdef CONFIG_SOFTWARE_SUSPEND
case
LINUX_REBOOT_CMD_SW_SUSPEND
:
case
LINUX_REBOOT_CMD_SW_SUSPEND
:
if
(
!
software_suspend_enabled
)
if
(
!
software_suspend_enabled
)
{
unlock_kernel
();
return
-
EAGAIN
;
return
-
EAGAIN
;
}
software_suspend
();
software_suspend
();
do_exit
(
0
);
do_exit
(
0
);
break
;
break
;
...
...
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