Merge branch 'akpm' (second patchbomb from Andrew Morton)

Merge more incoming from Andrew Morton:
 "Two new syscalls:

     memfd_create in "shm: add memfd_create() syscall"
     kexec_file_load in "kexec: implementation of new syscall kexec_file_load"

  And:

   - Most (all?) of the rest of MM

   - Lots of the usual misc bits

   - fs/autofs4

   - drivers/rtc

   - fs/nilfs

   - procfs

   - fork.c, exec.c

   - more in lib/

   - rapidio

   - Janitorial work in filesystems: fs/ufs, fs/reiserfs, fs/adfs,
     fs/cramfs, fs/romfs, fs/qnx6.

   - initrd/initramfs work

   - "file sealing" and the memfd_create() syscall, in tmpfs

   - add pci_zalloc_consistent, use it in lots of places

   - MAINTAINERS maintenance

   - kexec feature work"

* emailed patches from Andrew Morton <akpm@linux-foundation.org: (193 commits)
  MAINTAINERS: update nomadik patterns
  MAINTAINERS: update usb/gadget patterns
  MAINTAINERS: update DMA BUFFER SHARING patterns
  kexec: verify the signature of signed PE bzImage
  kexec: support kexec/kdump on EFI systems
  kexec: support for kexec on panic using new system call
  kexec-bzImage64: support for loading bzImage using 64bit entry
  kexec: load and relocate purgatory at kernel load time
  purgatory: core purgatory functionality
  purgatory/sha256: provide implementation of sha256 in purgaotory context
  kexec: implementation of new syscall kexec_file_load
  kexec: new syscall kexec_file_load() declaration
  kexec: make kexec_segment user buffer pointer a union
  resource: provide new functions to walk through resources
  kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc()
  kexec: move segment verification code in a separate function
  kexec: rename unusebale_pages to unusable_pages
  kernel: build bin2c based on config option CONFIG_BUILD_BIN2C
  bin2c: move bin2c in scripts/basic
  shm: wait for pins to be released when sealing
  ...

1 files changed, 8 insertions, 4 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index d2f65c856350..2836b5373b2e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -577,9 +577,10 @@ static int __remove_mapping(struct address_space *mapping, struct page *page,
 
         if (PageSwapCache(page)) {
                 swp_entry_t swap = { .val = page_private(page) };
+                mem_cgroup_swapout(page, swap);
                 __delete_from_swap_cache(page);
                 spin_unlock_irq(&mapping->tree_lock);
-                swapcache_free(swap, page);
+                swapcache_free(swap);
         } else {
                 void (*freepage)(struct page *);
                 void *shadow = NULL;
@@ -600,7 +601,6 @@ static int __remove_mapping(struct address_space *mapping, struct page *page,
                         shadow = workingset_eviction(mapping, page);
                 __delete_from_page_cache(page, shadow);
                 spin_unlock_irq(&mapping->tree_lock);
-                mem_cgroup_uncharge_cache_page(page);
 
                 if (freepage != NULL)
                         freepage(page);
@@ -822,7 +822,6 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 
         cond_resched();
 
-        mem_cgroup_uncharge_start();
         while (!list_empty(page_list)) {
                 struct address_space *mapping;
                 struct page *page;
@@ -1133,11 +1132,12 @@ keep:
                 VM_BUG_ON_PAGE(PageLRU(page) || PageUnevictable(page), page);
         }
 
+        mem_cgroup_uncharge_list(&free_pages);
         free_hot_cold_page_list(&free_pages, true);
 
         list_splice(&ret_pages, page_list);
         count_vm_events(PGACTIVATE, pgactivate);
-        mem_cgroup_uncharge_end();
+
         *ret_nr_dirty += nr_dirty;
         *ret_nr_congested += nr_congested;
         *ret_nr_unqueued_dirty += nr_unqueued_dirty;
@@ -1437,6 +1437,7 @@ putback_inactive_pages(struct lruvec *lruvec, struct list_head *page_list)
 
                         if (unlikely(PageCompound(page))) {
                                 spin_unlock_irq(&zone->lru_lock);
+                                mem_cgroup_uncharge(page);
                                 (*get_compound_page_dtor(page))(page);
                                 spin_lock_irq(&zone->lru_lock);
                         } else
@@ -1544,6 +1545,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
 
         spin_unlock_irq(&zone->lru_lock);
 
+        mem_cgroup_uncharge_list(&page_list);
         free_hot_cold_page_list(&page_list, true);
 
         /*
@@ -1658,6 +1660,7 @@ static void move_active_pages_to_lru(struct lruvec *lruvec,
 
                         if (unlikely(PageCompound(page))) {
                                 spin_unlock_irq(&zone->lru_lock);
+                                mem_cgroup_uncharge(page);
                                 (*get_compound_page_dtor(page))(page);
                                 spin_lock_irq(&zone->lru_lock);
                         } else
@@ -1765,6 +1768,7 @@ static void shrink_active_list(unsigned long nr_to_scan,
         __mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken);
         spin_unlock_irq(&zone->lru_lock);
 
+        mem_cgroup_uncharge_list(&l_hold);
         free_hot_cold_page_list(&l_hold, true);
 }