diff options
author | Chris Zankel <chris@zankel.net> | 2014-10-21 08:26:01 +0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-10-21 08:26:01 +0400 |
commit | a13926db3e5ea5bbac297f59e9f35061f52892d3 (patch) | |
tree | b794f25550b7dbbe9cc8eda81633df9023b4821c /arch/x86/power/hibernate_64.c | |
parent | f2589bff1ce8b94cebc044e5dfeac4d4e8701cbc (diff) | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
download | linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.tar.xz |
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
Diffstat (limited to 'arch/x86/power/hibernate_64.c')
-rw-r--r-- | arch/x86/power/hibernate_64.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index 35e2bb6c0f37..009947d419a6 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -17,11 +17,9 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/mtrr.h> +#include <asm/sections.h> #include <asm/suspend.h> -/* References to section boundaries */ -extern __visible const void __nosave_begin, __nosave_end; - /* Defined in hibernate_asm_64.S */ extern asmlinkage __visible int restore_image(void); |