Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82369
b: refs/heads/master
c: 2f8ed1c
h: refs/heads/master
i:
  82367: 681bc99
v: v3
  • Loading branch information
Adrian Bunk authored and Len Brown committed Feb 1, 2008
1 parent f55b4e1 commit 413e64b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 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: 964756a52f4cf0417d515b7f01eec69db8cb0fe2
refs/heads/master: 2f8ed1c60b06b797bf79a1dc540f0bed8c9d75a0
8 changes: 8 additions & 0 deletions trunk/kernel/power/power.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,11 @@ static inline int pm_notifier_call_chain(unsigned long val)
return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
== NOTIFY_BAD) ? -EINVAL : 0;
}

#ifdef CONFIG_HIGHMEM
unsigned int count_highmem_pages(void);
int restore_highmem(void);
#else
static inline unsigned int count_highmem_pages(void) { return 0; }
static inline int restore_highmem(void) { return 0; }
#endif
1 change: 0 additions & 1 deletion trunk/kernel/power/snapshot.c
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,6 @@ unsigned int count_highmem_pages(void)
}
#else
static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; }
static inline unsigned int count_highmem_pages(void) { return 0; }
#endif /* CONFIG_HIGHMEM */

/**
Expand Down
8 changes: 0 additions & 8 deletions trunk/kernel/power/swsusp.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ unsigned long image_size = 500 * 1024 * 1024;

int in_suspend __nosavedata = 0;

#ifdef CONFIG_HIGHMEM
unsigned int count_highmem_pages(void);
int restore_highmem(void);
#else
static inline int restore_highmem(void) { return 0; }
static inline unsigned int count_highmem_pages(void) { return 0; }
#endif

/**
* The following functions are used for tracing the allocated
* swap pages, so that they can be freed in case of an error.
Expand Down

0 comments on commit 413e64b

Please sign in to comment.