Merge branch 'akpm' (second patch-bomb from Andrew)

Merge second patchbomb from Andrew Morton:
 - the rest of MM
 - misc fs fixes
 - add execveat() syscall
 - new ratelimit feature for fault-injection
 - decompressor updates
 - ipc/ updates
 - fallocate feature creep
 - fsnotify cleanups
 - a few other misc things

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (99 commits)
  cgroups: Documentation: fix trivial typos and wrong paragraph numberings
  parisc: percpu: update comments referring to __get_cpu_var
  percpu: update local_ops.txt to reflect this_cpu operations
  percpu: remove __get_cpu_var and __raw_get_cpu_var macros
  fsnotify: remove destroy_list from fsnotify_mark
  fsnotify: unify inode and mount marks handling
  fallocate: create FAN_MODIFY and IN_MODIFY events
  mm/cma: make kmemleak ignore CMA regions
  slub: fix cpuset check in get_any_partial
  slab: fix cpuset check in fallback_alloc
  shmdt: use i_size_read() instead of ->i_size
  ipc/shm.c: fix overly aggressive shmdt() when calls span multiple segments
  ipc/msg: increase MSGMNI, remove scaling
  ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
  ipc/sem.c: change memory barrier in sem_lock() to smp_rmb()
  lib/decompress.c: consistency of compress formats for kernel image
  decompress_bunzip2: off by one in get_next_block()
  usr/Kconfig: make initrd compression algorithm selection not expert
  fault-inject: add ratelimit option
  ratelimit: add initialization macro
  ...

1 files changed, 0 insertions, 40 deletions

diff --git a/ipc/util.c b/ipc/util.c
index 88adc329888c..106bed0378ab 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -71,44 +71,6 @@ struct ipc_proc_iface {
         int (*show)(struct seq_file *, void *);
 };
 
-static void ipc_memory_notifier(struct work_struct *work)
-{
-        ipcns_notify(IPCNS_MEMCHANGED);
-}
-
-static int ipc_memory_callback(struct notifier_block *self,
-                                unsigned long action, void *arg)
-{
-        static DECLARE_WORK(ipc_memory_wq, ipc_memory_notifier);
-
-        switch (action) {
-        case MEM_ONLINE:    /* memory successfully brought online */
-        case MEM_OFFLINE:   /* or offline: it's time to recompute msgmni */
-                /*
-                 * This is done by invoking the ipcns notifier chain with the
-                 * IPC_MEMCHANGED event.
-                 * In order not to keep the lock on the hotplug memory chain
-                 * for too long, queue a work item that will, when waken up,
-                 * activate the ipcns notification chain.
-                 */
-                schedule_work(&ipc_memory_wq);
-                break;
-        case MEM_GOING_ONLINE:
-        case MEM_GOING_OFFLINE:
-        case MEM_CANCEL_ONLINE:
-        case MEM_CANCEL_OFFLINE:
-        default:
-                break;
-        }
-
-        return NOTIFY_OK;
-}
-
-static struct notifier_block ipc_memory_nb = {
-        .notifier_call = ipc_memory_callback,
-        .priority = IPC_CALLBACK_PRI,
-};
-
 /**
  * ipc_init - initialise ipc subsystem
  *
@@ -124,8 +86,6 @@ static int __init ipc_init(void)
         sem_init();
         msg_init();
         shm_init();
-        register_hotmemory_notifier(&ipc_memory_nb);
-        register_ipcns_notifier(&init_ipc_ns);
         return 0;
 }
 device_initcall(ipc_init);