Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29004
b: refs/heads/master
c: 7bff24e
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jun 23, 2006
1 parent 49f252e commit 13925c2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 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: a938c356d5b007fe6d28251c0ddbf6c11d0d92b5
refs/heads/master: 7bff24e255ee11ecbc304315a252fcbd84f9ffce
15 changes: 8 additions & 7 deletions trunk/kernel/power/snapshot.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static int restore_arch_mem(void)
}

#ifdef CONFIG_HIGHMEM
unsigned int count_highmem_pages(void)
static unsigned int count_highmem_pages(void)
{
struct zone *zone;
unsigned long zone_pfn;
Expand Down Expand Up @@ -199,7 +199,7 @@ static int save_highmem_zone(struct zone *zone)
return 0;
}

int save_highmem(void)
static int save_highmem(void)
{
struct zone *zone;
int res = 0;
Expand All @@ -216,7 +216,7 @@ int save_highmem(void)
return 0;
}

int restore_highmem(void)
static int restore_highmem(void)
{
printk("swsusp: Restoring Highmem\n");
while (highmem_copy) {
Expand All @@ -233,9 +233,9 @@ int restore_highmem(void)
return 0;
}
#else
static unsigned int count_highmem_pages(void) {return 0;}
static int save_highmem(void) {return 0;}
static int restore_highmem(void) {return 0;}
static inline unsigned int count_highmem_pages(void) {return 0;}
static inline int save_highmem(void) {return 0;}
static inline int restore_highmem(void) {return 0;}
#endif

unsigned int count_special_pages(void)
Expand Down Expand Up @@ -482,7 +482,8 @@ unsigned long get_safe_page(gfp_t gfp_mask)
* On each page we set up a list of struct_pbe elements.
*/

struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask, int safe_needed)
static struct pbe *alloc_pagedir(unsigned int nr_pages, gfp_t gfp_mask,
int safe_needed)
{
unsigned int num;
struct pbe *pblist, *pbe;
Expand Down

0 comments on commit 13925c2

Please sign in to comment.