14 files changed, 494 insertions, 134 deletions

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 1e4a6cc1b6ea..402ab99e409f 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1605,16 +1605,16 @@ Documentation/accounting.
 ---------------------------------------------------------------
 When a process is dumped, all anonymous memory is written to a core file as
 long as the size of the core file isn't limited. But sometimes we don't want
-to dump some memory segments, for example, huge shared memory. Conversely,
-sometimes we want to save file-backed memory segments into a core file, not
-only the individual files.
+to dump some memory segments, for example, huge shared memory or DAX.
+Conversely, sometimes we want to save file-backed memory segments into a core
+file, not only the individual files.
 
 /proc/<pid>/coredump_filter allows you to customize which memory segments
 will be dumped when the <pid> process is dumped. coredump_filter is a bitmask
 of memory types. If a bit of the bitmask is set, memory segments of the
 corresponding memory type are dumped, otherwise they are not dumped.
 
-The following 7 memory types are supported:
+The following 9 memory types are supported:
   - (bit 0) anonymous private memory
   - (bit 1) anonymous shared memory
   - (bit 2) file-backed private memory
@@ -1623,20 +1623,22 @@ The following 7 memory types are supported:
             effective only if the bit 2 is cleared)
   - (bit 5) hugetlb private memory
   - (bit 6) hugetlb shared memory
+  - (bit 7) DAX private memory
+  - (bit 8) DAX shared memory
 
   Note that MMIO pages such as frame buffer are never dumped and vDSO pages
   are always dumped regardless of the bitmask status.
 
-  Note bit 0-4 doesn't effect any hugetlb memory. hugetlb memory are only
-  effected by bit 5-6.
+  Note that bits 0-4 don't affect hugetlb or DAX memory. hugetlb memory is
+  only affected by bit 5-6, and DAX is only affected by bits 7-8.
 
-Default value of coredump_filter is 0x23; this means all anonymous memory
-segments and hugetlb private memory are dumped.
+The default value of coredump_filter is 0x33; this means all anonymous memory
+segments, ELF header pages and hugetlb private memory are dumped.
 
 If you don't want to dump all shared memory segments attached to pid 1234,
-write 0x21 to the process's proc file.
+write 0x31 to the process's proc file.
 
-  $ echo 0x21 > /proc/1234/coredump_filter
+  $ echo 0x31 > /proc/1234/coredump_filter
 
 When a new process is created, the process inherits the bitmask status from its
 parent. It is useful to set up coredump_filter before the program runs.
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 1f37cb2b56a9..493f54172b4a 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -354,7 +354,7 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
         }
 
         for (i = 0; i < nr_range; i++)
-                printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n",
+                pr_debug(" [mem %#010lx-%#010lx] page %s\n",
                                 mr[i].start, mr[i].end - 1,
                                 page_size_string(&mr[i]));
 
@@ -401,7 +401,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
         unsigned long ret = 0;
         int nr_range, i;
 
-        pr_info("init_memory_mapping: [mem %#010lx-%#010lx]\n",
+        pr_debug("init_memory_mapping: [mem %#010lx-%#010lx]\n",
                start, end - 1);
 
         memset(mr, 0, sizeof(mr));
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5ed62eff31bd..ec081fe0ce2c 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1270,7 +1270,7 @@ static int __meminit vmemmap_populate_hugepages(unsigned long start,
                                 /* check to see if we have contiguous blocks */
                                 if (p_end != p || node_start != node) {
                                         if (p_start)
-                                                printk(KERN_DEBUG " [%lx-%lx] PMD -> [%p-%p] on node %d\n",
+                                                pr_debug(" [%lx-%lx] PMD -> [%p-%p] on node %d\n",
                                                        addr_start, addr_end-1, p_start, p_end-1, node_start);
                                         addr_start = addr;
                                         node_start = node;
@@ -1368,7 +1368,7 @@ void register_page_bootmem_memmap(unsigned long section_nr,
 void __meminit vmemmap_populate_print_last(void)
 {
         if (p_start) {
-                printk(KERN_DEBUG " [%lx-%lx] PMD -> [%p-%p] on node %d\n",
+                pr_debug(" [%lx-%lx] PMD -> [%p-%p] on node %d\n",
                         addr_start, addr_end-1, p_start, p_end-1, node_start);
                 p_start = NULL;
                 p_end = NULL;
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index 6e26761a27da..f7dab53b352a 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -33,6 +33,15 @@ static bool force_enable_dimms;
 module_param(force_enable_dimms, bool, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(force_enable_dimms, "Ignore _STA (ACPI DIMM device) status");
 
+struct nfit_table_prev {
+        struct list_head spas;
+        struct list_head memdevs;
+        struct list_head dcrs;
+        struct list_head bdws;
+        struct list_head idts;
+        struct list_head flushes;
+};
+
 static u8 nfit_uuid[NFIT_UUID_MAX][16];
 
 const u8 *to_nfit_uuid(enum nfit_uuids id)
@@ -221,12 +230,20 @@ static int nfit_spa_type(struct acpi_nfit_system_address *spa)
 }
 
 static bool add_spa(struct acpi_nfit_desc *acpi_desc,
+                struct nfit_table_prev *prev,
                 struct acpi_nfit_system_address *spa)
 {
         struct device *dev = acpi_desc->dev;
-        struct nfit_spa *nfit_spa = devm_kzalloc(dev, sizeof(*nfit_spa),
-                        GFP_KERNEL);
+        struct nfit_spa *nfit_spa;
+
+        list_for_each_entry(nfit_spa, &prev->spas, list) {
+                if (memcmp(nfit_spa->spa, spa, sizeof(*spa)) == 0) {
+                        list_move_tail(&nfit_spa->list, &acpi_desc->spas);
+                        return true;
+                }
+        }
 
+        nfit_spa = devm_kzalloc(dev, sizeof(*nfit_spa), GFP_KERNEL);
         if (!nfit_spa)
                 return false;
         INIT_LIST_HEAD(&nfit_spa->list);
@@ -239,12 +256,19 @@ static bool add_spa(struct acpi_nfit_desc *acpi_desc,
 }
 
 static bool add_memdev(struct acpi_nfit_desc *acpi_desc,
+                struct nfit_table_prev *prev,
                 struct acpi_nfit_memory_map *memdev)
 {
         struct device *dev = acpi_desc->dev;
-        struct nfit_memdev *nfit_memdev = devm_kzalloc(dev,
-                        sizeof(*nfit_memdev), GFP_KERNEL);
+        struct nfit_memdev *nfit_memdev;
 
+        list_for_each_entry(nfit_memdev, &prev->memdevs, list)
+                if (memcmp(nfit_memdev->memdev, memdev, sizeof(*memdev)) == 0) {
+                        list_move_tail(&nfit_memdev->list, &acpi_desc->memdevs);
+                        return true;
+                }
+
+        nfit_memdev = devm_kzalloc(dev, sizeof(*nfit_memdev), GFP_KERNEL);
         if (!nfit_memdev)
                 return false;
         INIT_LIST_HEAD(&nfit_memdev->list);
@@ -257,12 +281,19 @@ static bool add_memdev(struct acpi_nfit_desc *