Merge tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[mirror_ubuntu-artful-kernel.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index d89034a393f276457118b0696613c92c83ae8fcc..be93949b4885991e81a5e0aa0e5ba4d919579f69 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1642,6 +1642,11 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
        for (i = 0; i < area->nr_pages; i++) {
                struct page *page;
 
+               if (fatal_signal_pending(current)) {
+                       area->nr_pages = i;
+                       goto fail;
+               }
+
                if (node == NUMA_NO_NODE)
                        page = alloc_page(alloc_mask);
                else
@@ -2654,7 +2659,7 @@ static int s_show(struct seq_file *m, void *p)
                seq_printf(m, " pages=%d", v->nr_pages);
 
        if (v->phys_addr)
-               seq_printf(m, " phys=%llx", (unsigned long long)v->phys_addr);
+               seq_printf(m, " phys=%pa", &v->phys_addr);
 
        if (v->flags & VM_IOREMAP)
                seq_puts(m, " ioremap");