Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301f8d74 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM: hibernate: constify attribute_group structures.
  PM / hibernate: Drop redundant parameter of swsusp_alloc()
  PM / hibernate: Use CONFIG_HAVE_SET_MEMORY for include condition
  x86/power/64: Use char arrays for asm function names
parents f1c7842e 59494fe2

arch/x86/include/asm/suspend_64.h

+2 −3
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ struct saved_context { 
	set_debugreg((thread)->debugreg##register, register)



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);

extern char core_restore_code;

extern char restore_registers;

extern char core_restore_code[];

extern char restore_registers[];



#endif /* _ASM_X86_SUSPEND_64_H */

arch/x86/power/hibernate_64.c

+3 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int relocate_restore_code(void) 
	if (!relocated_restore_code)

		return -ENOMEM;



	memcpy((void *)relocated_restore_code, &core_restore_code, PAGE_SIZE);

	memcpy((void *)relocated_restore_code, core_restore_code, PAGE_SIZE);



	/* Make the page containing the relocated code executable */

	pgd = (pgd_t *)__va(read_cr3()) + pgd_index(relocated_restore_code);
@@ -292,8 +292,8 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size) 


	if (max_size < sizeof(struct restore_data_record))

		return -EOVERFLOW;

	rdr->jump_address = (unsigned long)&restore_registers;

	rdr->jump_address_phys = __pa_symbol(&restore_registers);

	rdr->jump_address = (unsigned long)restore_registers;

	rdr->jump_address_phys = __pa_symbol(restore_registers);

	rdr->cr3 = restore_cr3;

	rdr->magic = RESTORE_MAGIC;

kernel/power/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ static struct attribute * g[] = { 
};





static struct attribute_group attr_group = {

static const struct attribute_group attr_group = {

	.attrs = g,

};

kernel/power/snapshot.c

+5 −6
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ 
#include <asm/pgtable.h>

#include <asm/tlbflush.h>

#include <asm/io.h>

#ifdef CONFIG_STRICT_KERNEL_RWX

#ifdef CONFIG_ARCH_HAS_SET_MEMORY

#include <asm/set_memory.h>

#endif



#include "power.h"



#ifdef CONFIG_STRICT_KERNEL_RWX

#if defined(CONFIG_STRICT_KERNEL_RWX) && defined(CONFIG_ARCH_HAS_SET_MEMORY)

static bool hibernate_restore_protection;

static bool hibernate_restore_protection_active;
@@ -77,7 +77,7 @@ static inline void hibernate_restore_protection_begin(void) {} 
static inline void hibernate_restore_protection_end(void) {}

static inline void hibernate_restore_protect_page(void *page_address) {}

static inline void hibernate_restore_unprotect_page(void *page_address) {}

#endif /* CONFIG_STRICT_KERNEL_RWX */

#endif /* CONFIG_STRICT_KERNEL_RWX  && CONFIG_ARCH_HAS_SET_MEMORY */



static int swsusp_page_is_free(struct page *);

static void swsusp_set_page_forbidden(struct page *);
@@ -1929,8 +1929,7 @@ static inline unsigned int alloc_highmem_pages(struct memory_bitmap *bm, 
 * also be located in the high memory, because of the way in which

 * copy_data_pages() works.

 */

static int swsusp_alloc(struct memory_bitmap *orig_bm,

			struct memory_bitmap *copy_bm,

static int swsusp_alloc(struct memory_bitmap *copy_bm,

			unsigned int nr_pages, unsigned int nr_highmem)

{

	if (nr_highmem > 0) {
@@ -1976,7 +1975,7 @@ asmlinkage __visible int swsusp_save(void) 
		return -ENOMEM;

	}



	if (swsusp_alloc(&orig_bm, &copy_bm, nr_pages, nr_highmem)) {

	if (swsusp_alloc(&copy_bm, nr_pages, nr_highmem)) {

		printk(KERN_ERR "PM: Memory allocation failed\n");

		return -ENOMEM;

	}