diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
| commit | 8134585f1c33565ea5e752a7ba9323ed3e0921f3 (patch) | |
| tree | 1fd22479884783bb498702169de744b513dd68f7 /arch/x86/power/hibernate_32.c | |
| parent | 05f74e8baccb60882ace4d0165887368e8143f3f (diff) | |
| parent | 9182148a5315d4b1de68ac74fd54cbb5da5a3703 (diff) | |
Merge tag 'v3.10.77' into linux-linaro-lsk
This is the 3.10.77 stable release
Conflicts:
drivers/video/console/Kconfig
scripts/kconfig/menu.c
Diffstat (limited to 'arch/x86/power/hibernate_32.c')
| -rw-r--r-- | arch/x86/power/hibernate_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c index 7d28c885d238..291226b952a9 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c @@ -13,13 +13,11 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/mmzone.h> +#include <asm/sections.h> /* Defined in hibernate_asm_32.S */ extern int restore_image(void); -/* References to section boundaries */ -extern const void __nosave_begin, __nosave_end; - /* Pointer to the temporary resume page tables */ pgd_t *resume_pg_dir; |