From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Aug 2013 17:04:43 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew Morton)
X-Git-Tag: v3.11-rc6~13
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/f1d6e17f540af37bb1891480143669ba7636c4cf?hp=-c

Merge branch 'akpm' (patches from Andrew Morton)

Merge a bunch of fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  fs/proc/task_mmu.c: fix buffer overflow in add_page_map()
  arch: *: Kconfig: add "kernel/Kconfig.freezer" to "arch/*/Kconfig"
  ocfs2: fix null pointer dereference in ocfs2_dir_foreach_blk_id()
  x86 get_unmapped_area(): use proper mmap base for bottom-up direction
  ocfs2: fix NULL pointer dereference in ocfs2_duplicate_clusters_by_page
  ocfs2: Revert 40bd62e to avoid regression in extended allocation
  drivers/rtc/rtc-stmp3xxx.c: provide timeout for potentially endless loop polling a HW bit
  hugetlb: fix lockdep splat caused by pmd sharing
  aoe: adjust ref of head for compound page tails
  microblaze: fix clone syscall
  mm: save soft-dirty bits on file pages
  mm: save soft-dirty bits on swapped pages
  memcg: don't initialize kmem-cache destroying work for root caches
---

f1d6e17f540af37bb1891480143669ba7636c4cf
diff --combined include/linux/sched.h
index 078066daffd4,923dd6ea4a0e..e9995eb5985c
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -314,6 -314,7 +314,7 @@@ struct nsproxy
  struct user_namespace;
  
  #ifdef CONFIG_MMU
+ extern unsigned long mmap_legacy_base(void);
  extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
@@@ -1532,8 -1533,6 +1533,8 @@@ static inline pid_t task_pgrp_nr(struc
   * Test if a process is not yet dead (at most zombie state)
   * If pid_alive fails, then pointers within the task structure
   * can be stale and must not be dereferenced.
 + *
 + * Return: 1 if the process is alive. 0 otherwise.
   */
  static inline int pid_alive(struct task_struct *p)
  {
@@@ -1545,8 -1544,6 +1546,8 @@@
   * @tsk: Task structure to be checked.
   *
   * Check if a task structure is the first user space task the kernel created.
 + *
 + * Return: 1 if the task structure is init. 0 otherwise.
   */
  static inline int is_global_init(struct task_struct *tsk)
  {
@@@ -1898,8 -1895,6 +1899,8 @@@ extern struct task_struct *idle_task(in
  /**
   * is_idle_task - is the specified task an idle task?
   * @p: the task in question.
 + *
 + * Return: 1 if @p is an idle task. 0 otherwise.
   */
  static inline bool is_idle_task(const struct task_struct *p)
  {