diff options
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/console.c | 1 | ||||
| -rw-r--r-- | kernel/power/snapshot.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index 463aa673675..eacb8bd8cab 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -81,6 +81,7 @@ void pm_vt_switch_unregister(struct device *dev) list_for_each_entry(tmp, &pm_vt_switch_list, head) { if (tmp->dev == dev) { list_del(&tmp->head); + kfree(tmp); break; } } diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index b38109e204a..d9f61a14580 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -637,7 +637,7 @@ __register_nosave_region(unsigned long start_pfn, unsigned long end_pfn, BUG_ON(!region); } else /* This allocation cannot fail */ - region = alloc_bootmem(sizeof(struct nosave_region)); + region = memblock_virt_alloc(sizeof(struct nosave_region), 0); region->start_pfn = start_pfn; region->end_pfn = end_pfn; list_add_tail(®ion->list, &nosave_regions); |