Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46edaeda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's fixups) 

Merge random fixes from Andrew Morton.

* emailed from Andrew Morton <akpm@linux-foundation.org>: (11 patches)
  mm: correctly synchronize rss-counters at exit/exec
  btree: catch NULL value before it does harm
  btree: fix tree corruption in btree_get_prev()
  ipc: shm: restore MADV_REMOVE functionality on shared memory segments
  drivers/platform/x86/acerhdf.c: correct Boris' mail address
  c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
  c/r: prctl: add ability to get clear_tid_address
  c/r: prctl: add minimal address test to PR_SET_MM
  c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
  MAINTAINERS: whitespace fixes
  shmem: replace_page must flush_dcache and others
parents 513335f9 40af1bbd

drivers/platform/x86/acerhdf.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * (C) 2009 - Peter Feuerer     peter (a) piie.net

 *                              http://piie.net

 *     2009 Borislav Petkov <petkovbb@gmail.com>

 *     2009 Borislav Petkov	bp (a) alien8.de

 *

 * Inspired by and many thanks to:

 *  o acerfand   - Rachel Greenham

fs/exec.c

+0 −1
Original line number Diff line number Diff line
@@ -819,7 +819,6 @@ static int exec_mmap(struct mm_struct *mm) 
	/* Notify parent that we're no longer interested in the old VM */

	tsk = current;

	old_mm = current->mm;

	sync_mm_rss(old_mm);

	mm_release(tsk, old_mm);



	if (old_mm) {

include/linux/prctl.h

+6 −4
Original line number Diff line number Diff line
@@ -145,4 +145,6 @@ 
#define PR_SET_NO_NEW_PRIVS	38

#define PR_GET_NO_NEW_PRIVS	39



#define PR_GET_TID_ADDRESS	40



#endif /* _LINUX_PRCTL_H */

include/linux/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ extern int get_dumpable(struct mm_struct *mm); 
					/* leave room for more dump flags */

#define MMF_VM_MERGEABLE	16	/* KSM may merge identical pages */

#define MMF_VM_HUGEPAGE		17	/* set when VM_HUGEPAGE is set on vma */

#define MMF_EXE_FILE_CHANGED	18	/* see prctl_set_mm_exe_file() */



#define MMF_INIT_MASK		(MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK)

ipc/shm.c

+12 −0
Original line number Diff line number Diff line
@@ -393,6 +393,16 @@ static int shm_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
	return sfd->file->f_op->fsync(sfd->file, start, end, datasync);

}



static long shm_fallocate(struct file *file, int mode, loff_t offset,

			  loff_t len)

{

	struct shm_file_data *sfd = shm_file_data(file);



	if (!sfd->file->f_op->fallocate)

		return -EOPNOTSUPP;

	return sfd->file->f_op->fallocate(file, mode, offset, len);

}



static unsigned long shm_get_unmapped_area(struct file *file,

	unsigned long addr, unsigned long len, unsigned long pgoff,

	unsigned long flags)
@@ -410,6 +420,7 @@ static const struct file_operations shm_file_operations = { 
	.get_unmapped_area	= shm_get_unmapped_area,

#endif

	.llseek		= noop_llseek,

	.fallocate	= shm_fallocate,

};



static const struct file_operations shm_file_operations_huge = {
@@ -418,6 +429,7 @@ static const struct file_operations shm_file_operations_huge = { 
	.release	= shm_release,

	.get_unmapped_area	= shm_get_unmapped_area,

	.llseek		= noop_llseek,

	.fallocate	= shm_fallocate,

};



int is_file_shm_hugepages(struct file *file)