Merge branch 'akpm' (patches from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 "Quite a lot of other stuff is banked up awaiting further
  next->mainline merging, but this batch contains:

   - Lots of random misc patches
   - OCFS2
   - Most of MM
   - backlight updates
   - lib/ updates
   - printk updates
   - checkpatch updates
   - epoll tweaking
   - rtc updates
   - hfs
   - hfsplus
   - documentation
   - procfs
   - update gcov to gcc-4.7 format
   - IPC"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (269 commits)
  ipc, msg: fix message length check for negative values
  ipc/util.c: remove unnecessary work pending test
  devpts: plug the memory leak in kill_sb
  ./Makefile: export initial ramdisk compression config option
  init/Kconfig: add option to disable kernel compression
  drivers: w1: make w1_slave::flags long to avoid memory corruption
  drivers/w1/masters/ds1wm.cuse dev_get_platdata()
  drivers/memstick/core/ms_block.c: fix unreachable state in h_msb_read_page()
  drivers/memstick/core/mspro_block.c: fix attributes array allocation
  drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
  kernel/panic.c: reduce 1 byte usage for print tainted buffer
  gcov: reuse kbasename helper
  kernel/gcov/fs.c: use pr_warn()
  kernel/module.c: use pr_foo()
  gcov: compile specific gcov implementation based on gcc version
  gcov: add support for gcc 4.7 gcov format
  gcov: move gcov structs definitions to a gcc version specific file
  kernel/taskstats.c: return -ENOMEM when alloc memory fails in add_del_listener()
  kernel/taskstats.c: add nla_nest_cancel() for failure processing between nla_nest_start() and nla_nest_end()
  kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
  ...

1 files changed, 20 insertions, 12 deletions

diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index 71c9c2511ee7..d5e9d6d185c8 100644
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -59,12 +59,14 @@
 #define PM_PSHIFT_BITS      6
 #define PM_PSHIFT_OFFSET    (PM_STATUS_OFFSET - PM_PSHIFT_BITS)
 #define PM_PSHIFT_MASK      (((1LL << PM_PSHIFT_BITS) - 1) << PM_PSHIFT_OFFSET)
-#define PM_PSHIFT(x)        (((u64) (x) << PM_PSHIFT_OFFSET) & PM_PSHIFT_MASK)
+#define __PM_PSHIFT(x)      (((uint64_t) (x) << PM_PSHIFT_OFFSET) & PM_PSHIFT_MASK)
 #define PM_PFRAME_MASK      ((1LL << PM_PSHIFT_OFFSET) - 1)
 #define PM_PFRAME(x)        ((x) & PM_PFRAME_MASK)
 
+#define __PM_SOFT_DIRTY      (1LL)
 #define PM_PRESENT          PM_STATUS(4LL)
 #define PM_SWAP             PM_STATUS(2LL)
+#define PM_SOFT_DIRTY       __PM_PSHIFT(__PM_SOFT_DIRTY)
 
 
 /*
@@ -83,6 +85,7 @@
 #define KPF_OWNER_PRIVATE       37
 #define KPF_ARCH                38
 #define KPF_UNCACHED            39
+#define KPF_SOFTDIRTY           40
 
 /* [48-] take some arbitrary free slots for expanding overloaded flags
  * not part of kernel API
@@ -132,6 +135,7 @@ static const char * const page_flag_names[] = {
         [KPF_OWNER_PRIVATE]     = "O:owner_private",
         [KPF_ARCH]              = "h:arch",
         [KPF_UNCACHED]          = "c:uncached",
+        [KPF_SOFTDIRTY]         = "f:softdirty",
 
         [KPF_READAHEAD]         = "I:readahead",
         [KPF_SLOB_FREE]         = "P:slob_free",
@@ -417,7 +421,7 @@ static int bit_mask_ok(uint64_t flags)
         return 1;
 }
 
-static uint64_t expand_overloaded_flags(uint64_t flags)
+static uint64_t expand_overloaded_flags(uint64_t flags, uint64_t pme)
 {
         /* SLOB/SLUB overload several page flags */
         if (flags & BIT(SLAB)) {
@@ -433,6 +437,9 @@ static uint64_t expand_overloaded_flags(uint64_t flags)
         if ((flags & (BIT(RECLAIM) | BIT(WRITEBACK))) == BIT(RECLAIM))
                 flags ^= BIT(RECLAIM) | BIT(READAHEAD);
 
+        if (pme & PM_SOFT_DIRTY)
+                flags |= BIT(SOFTDIRTY);
+
         return flags;
 }
 
@@ -448,11 +455,11 @@ static uint64_t well_known_flags(uint64_t flags)
         return flags;
 }
 
-static uint64_t kpageflags_flags(uint64_t flags)
+static uint64_t kpageflags_flags(uint64_t flags, uint64_t pme)
 {
-        flags = expand_overloaded_flags(flags);
-
-        if (!opt_raw)
+        if (opt_raw)
+                flags = expand_overloaded_flags(flags, pme);
+        else
                 flags = well_known_flags(flags);
 
         return flags;
@@ -545,9 +552,9 @@ static size_t hash_slot(uint64_t flags)
 }
 
 static void add_page(unsigned long voffset,
-                     unsigned long offset, uint64_t flags)
+                     unsigned long offset, uint64_t flags, uint64_t pme)
 {
-        flags = kpageflags_flags(flags);
+        flags = kpageflags_flags(flags, pme);
 
         if (!bit_mask_ok(flags))
                 return;
@@ -569,7 +576,8 @@ static void add_page(unsigned long voffset,
 #define KPAGEFLAGS_BATCH        (64 << 10)      /* 64k pages */
 static void walk_pfn(unsigned long voffset,
                      unsigned long index,
-                     unsigned long count)
+                     unsigned long count,
+                     uint64_t pme)
 {
         uint64_t buf[KPAGEFLAGS_BATCH];
         unsigned long batch;
@@ -583,7 +591,7 @@ static void walk_pfn(unsigned long voffset,
                         break;
 
                 for (i = 0; i < pages; i++)
-                        add_page(voffset + i, index + i, buf[i]);
+                        add_page(voffset + i, index + i, buf[i], pme);
 
                 index += pages;
                 count -= pages;
@@ -608,7 +616,7 @@ static void walk_vma(unsigned long index, unsigned long count)
                 for (i = 0; i < pages; i++) {
                         pfn = pagemap_pfn(buf[i]);
                         if (pfn)
-                                walk_pfn(index + i, pfn, 1);
+                                walk_pfn(index + i, pfn, 1, buf[i]);
                 }
 
                 index += pages;
@@ -659,7 +667,7 @@ static void walk_addr_ranges(void)
 
         for (i = 0; i < nr_addr_ranges; i++)
                 if (!opt_pid)
-                        walk_pfn(0, opt_offset[i], opt_size[i]);
+                        walk_pfn(0, opt_offset[i], opt_size[i], 0);
                 else
                         walk_task(opt_offset[i], opt_size[i]);