Commit 99161612 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86-64: CONFIG_PM=n build fix

This patch fixes a compile problem on x86-64 when CONFIG_PM is turned off. 
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 294eeb4f
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pm.h> #include <linux/pm.h>
#ifdef CONFIG_PM
/* page backup entry */ /* page backup entry */
typedef struct pbe { typedef struct pbe {
unsigned long address; /* address of the copy */ unsigned long address; /* address of the copy */
...@@ -33,6 +32,7 @@ extern int shrink_mem(void); ...@@ -33,6 +32,7 @@ extern int shrink_mem(void);
extern void drain_local_pages(void); extern void drain_local_pages(void);
extern void mark_free_pages(struct zone *zone); extern void mark_free_pages(struct zone *zone);
#ifdef CONFIG_PM
/* kernel/power/swsusp.c */ /* kernel/power/swsusp.c */
extern int software_suspend(void); extern int software_suspend(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment