Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 212377
b: refs/heads/master
c: 3624eb0
h: refs/heads/master
i:
  212375: 3ce3eea
v: v3
  • Loading branch information
Rafael J. Wysocki committed Oct 16, 2010
1 parent 6f08db6 commit db0928f
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: 71c63122c4609a917f14a79c32067a68909fc487
refs/heads/master: 3624eb04c24861ab296842414f9752a393e68372
6 changes: 3 additions & 3 deletions trunk/kernel/power/swap.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include "power.h"

#define SWSUSP_SIG "S1SUSPEND"
#define HIBERNATE_SIG "LINHIB0001"

/*
* The swap map is a data structure used for keeping track of each page
Expand Down Expand Up @@ -195,7 +195,7 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
!memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
memcpy(swsusp_header->sig,SWSUSP_SIG, 10);
memcpy(swsusp_header->sig, HIBERNATE_SIG, 10);
swsusp_header->image = handle->first_sector;
swsusp_header->flags = flags;
error = hib_bio_write_page(swsusp_resume_block,
Expand Down Expand Up @@ -916,7 +916,7 @@ int swsusp_check(void)
if (error)
goto put;

if (!memcmp(SWSUSP_SIG, swsusp_header->sig, 10)) {
if (!memcmp(HIBERNATE_SIG, swsusp_header->sig, 10)) {
memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
/* Reset swap signature now */
error = hib_bio_write_page(swsusp_resume_block,
Expand Down

0 comments on commit db0928f

Please sign in to comment.