Commit a7b4b007 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These make the buffer handling in pm_show_wakelocks() more robust and
  drop an unused hibernation-related function.

  Specifics:

   - Make the buffer handling in pm_show_wakelocks() more robust by
     using sysfs_emit_at() in it to generate output (Greg
     Kroah-Hartman).

   - Drop register_nosave_region_late() which is not used (Amadeusz
     Sławiński)"

* tag 'pm-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: hibernate: Remove register_nosave_region_late()
  PM: wakeup: simplify the output logic of pm_show_wakelocks()
parents df000154 33569ef3

include/linux/suspend.h

+1 −10
Original line number Diff line number Diff line
@@ -430,15 +430,7 @@ struct platform_hibernation_ops { 


#ifdef CONFIG_HIBERNATION

/* kernel/power/snapshot.c */

extern void __register_nosave_region(unsigned long b, unsigned long e, int km);

static inline void __init register_nosave_region(unsigned long b, unsigned long e)

{

	__register_nosave_region(b, e, 0);

}

static inline void __init register_nosave_region_late(unsigned long b, unsigned long e)

{

	__register_nosave_region(b, e, 1);

}

extern void register_nosave_region(unsigned long b, unsigned long e);

extern int swsusp_page_is_forbidden(struct page *);

extern void swsusp_set_page_free(struct page *);

extern void swsusp_unset_page_free(struct page *);
@@ -458,7 +450,6 @@ int pfn_is_nosave(unsigned long pfn); 
int hibernate_quiet_exec(int (*func)(void *data), void *data);

#else /* CONFIG_HIBERNATION */

static inline void register_nosave_region(unsigned long b, unsigned long e) {}

static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}

static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }

static inline void swsusp_set_page_free(struct page *p) {}

static inline void swsusp_unset_page_free(struct page *p) {}

kernel/power/snapshot.c

+7 −14
Original line number Diff line number Diff line
@@ -978,8 +978,7 @@ static void memory_bm_recycle(struct memory_bitmap *bm) 
 * Register a range of page frames the contents of which should not be saved

 * during hibernation (to be used in the early initialization code).

 */

void __init __register_nosave_region(unsigned long start_pfn,

				     unsigned long end_pfn, int use_kmalloc)

void __init register_nosave_region(unsigned long start_pfn, unsigned long end_pfn)

{

	struct nosave_region *region;
@@ -995,18 +994,12 @@ void __init __register_nosave_region(unsigned long start_pfn, 
			goto Report;

		}

	}

	if (use_kmalloc) {

		/* During init, this shouldn't fail */

		region = kmalloc(sizeof(struct nosave_region), GFP_KERNEL);

		BUG_ON(!region);

	} else {

	/* This allocation cannot fail */

	region = memblock_alloc(sizeof(struct nosave_region),

				SMP_CACHE_BYTES);

	if (!region)

		panic("%s: Failed to allocate %zu bytes\n", __func__,

		      sizeof(struct nosave_region));

	}

	region->start_pfn = start_pfn;

	region->end_pfn = end_pfn;

	list_add_tail(&region->list, &nosave_regions);

kernel/power/wakelock.c

+4 −7
Original line number Diff line number Diff line
@@ -39,23 +39,20 @@ ssize_t pm_show_wakelocks(char *buf, bool show_active) 
{

	struct rb_node *node;

	struct wakelock *wl;

	char *str = buf;

	char *end = buf + PAGE_SIZE;

	int len = 0;



	mutex_lock(&wakelocks_lock);



	for (node = rb_first(&wakelocks_tree); node; node = rb_next(node)) {

		wl = rb_entry(node, struct wakelock, node);

		if (wl->ws->active == show_active)

			str += scnprintf(str, end - str, "%s ", wl->name);

			len += sysfs_emit_at(buf, len, "%s ", wl->name);

	}

	if (str > buf)

		str--;



	str += scnprintf(str, end - str, "\n");

	len += sysfs_emit_at(buf, len, "\n");



	mutex_unlock(&wakelocks_lock);

	return (str - buf);

	return len;

}



#if CONFIG_PM_WAKELOCKS_LIMIT > 0