Merge branch 'akpm' (patches from Andrew Morton) into next

Merge more updates from Andrew Morton:

 - Most of the rest of MM.

   This includes "mark remap_file_pages syscall as deprecated" but the
   actual "replace remap_file_pages syscall with emulation" is held
   back.  I guess we'll need to work out when to pull the trigger on
   that one.

 - various minor cleanups to obscure filesystems

 - the drivers/rtc queue

 - hfsplus updates

 - ufs, hpfs, fatfs, affs, reiserfs

 - Documentation/

 - signals

 - procfs

 - cpu hotplug

 - lib/idr.c

 - rapidio

 - sysctl

 - ipc updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

1 files changed, 7 insertions, 5 deletions

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 2b60ce1996aa..bb9cebc9ca8a 100644
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -75,10 +75,13 @@ void jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c)
 static int jffs2_garbage_collect_thread(void *_c)
 {
         struct jffs2_sb_info *c = _c;
+        sigset_t hupmask;
 
+        siginitset(&hupmask, sigmask(SIGHUP));
         allow_signal(SIGKILL);
         allow_signal(SIGSTOP);
         allow_signal(SIGCONT);
+        allow_signal(SIGHUP);
 
         c->gc_task = current;
         complete(&c->gc_thread_start);
@@ -87,7 +90,7 @@ static int jffs2_garbage_collect_thread(void *_c)
 
         set_freezable();
         for (;;) {
-                allow_signal(SIGHUP);
+                sigprocmask(SIG_UNBLOCK, &hupmask, NULL);
         again:
                 spin_lock(&c->erase_completion_lock);
                 if (!jffs2_thread_should_wake(c)) {
@@ -95,10 +98,9 @@ static int jffs2_garbage_collect_thread(void *_c)
                         spin_unlock(&c->erase_completion_lock);
                         jffs2_dbg(1, "%s(): sleeping...\n", __func__);
                         schedule();
-                } else
+                } else {
                         spin_unlock(&c->erase_completion_lock);
-                        
-
+                }
                 /* Problem - immediately after bootup, the GCD spends a lot
                  * of time in places like jffs2_kill_fragtree(); so much so
                  * that userspace processes (like gdm and X) are starved
@@ -150,7 +152,7 @@ static int jffs2_garbage_collect_thread(void *_c)
                         }
                 }
                 /* We don't want SIGHUP to interrupt us. STOP and KILL are OK though. */
-                disallow_signal(SIGHUP);
+                sigprocmask(SIG_BLOCK, &hupmask, NULL);
 
                 jffs2_dbg(1, "%s(): pass\n", __func__);
                 if (jffs2_garbage_collect_pass(c) == -ENOSPC) {