Commit aa2e7100 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton:
 "A few hotfixes and various leftovers which were awaiting other merges.

  Mainly movement of zram into mm/"

* emailed patches fron Andrew Morton <akpm@linux-foundation.org>: (25 commits)
  memcg: fix mutex not unlocked on memcg_create_kmem_cache fail path
  Documentation/filesystems/vfs.txt: update file_operations documentation
  mm, oom: base root bonus on current usage
  mm: don't lose the SOFT_DIRTY flag on mprotect
  mm/slub.c: fix page->_count corruption (again)
  mm/mempolicy.c: fix mempolicy printing in numa_maps
  zram: remove zram->lock in read path and change it with mutex
  zram: remove workqueue for freeing removed pending slot
  zram: introduce zram->tb_lock
  zram: use atomic operation for stat
  zram: remove unnecessary free
  zram: delay pending free request in read path
  zram: fix race between reset and flushing pending work
  zsmalloc: add maintainers
  zram: add zram maintainers
  zsmalloc: add copyright
  zram: add copyright
  zram: remove old private project comment
  zram: promote zram from staging
  zsmalloc: move it under mm
  ...
parents 2def2ef2 7c094fd6

drivers/staging/zram/zram.txt→Documentation/blockdev/zram.txt

+0 −6
Original line number Diff line number Diff line 
zram: Compressed RAM based block devices

----------------------------------------



Project home: http://compcache.googlecode.com/



* Introduction



The zram module creates RAM based block devices named /dev/zram<id>
@@ -69,9 +67,5 @@ Following shows a typical sequence of steps for using zram. 
	resets the disksize to zero. You must set the disksize again

	before reusing the device.



Please report any problems at:

 - Mailing list: linux-mm-cc at laptop dot org

 - Issue tracker: http://code.google.com/p/compcache/issues/list



Nitin Gupta

ngupta@vflare.org

Documentation/filesystems/proc.txt

+2 −2
Original line number Diff line number Diff line
@@ -1386,8 +1386,8 @@ may allocate from based on an estimation of its current memory and swap use. 
For example, if a task is using all allowed memory, its badness score will be

1000.  If it is using half of its allowed memory, its score will be 500.



There is an additional factor included in the badness score: root

processes are given 3% extra memory over other tasks.

There is an additional factor included in the badness score: the current memory

and swap usage is discounted by 3% for root processes.



The amount of "allowed" memory depends on the context in which the oom killer

was called.  If it is due to the memory assigned to the allocating task's cpuset

Documentation/filesystems/vfs.txt

+2 −10
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ struct file_operations 
----------------------



This describes how the VFS can manipulate an open file. As of kernel

3.5, the following members are defined:

3.12, the following members are defined:



struct file_operations {

	struct module *owner;
@@ -803,9 +803,6 @@ struct file_operations { 
	int (*aio_fsync) (struct kiocb *, int datasync);

	int (*fasync) (int, struct file *, int);

	int (*lock) (struct file *, int, struct file_lock *);

	ssize_t (*readv) (struct file *, const struct iovec *, unsigned long, loff_t *);

	ssize_t (*writev) (struct file *, const struct iovec *, unsigned long, loff_t *);

	ssize_t (*sendfile) (struct file *, loff_t *, size_t, read_actor_t, void *);

	ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);

	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);

	int (*check_flags)(int);
@@ -814,6 +811,7 @@ struct file_operations { 
	ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);

	int (*setlease)(struct file *, long arg, struct file_lock **);

	long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len);

	int (*show_fdinfo)(struct seq_file *m, struct file *f);

};



Again, all methods are called without any locks being held, unless
@@ -864,12 +862,6 @@ otherwise noted. 
  lock: called by the fcntl(2) system call for F_GETLK, F_SETLK, and F_SETLKW

  	commands



  readv: called by the readv(2) system call



  writev: called by the writev(2) system call



  sendfile: called by the sendfile(2) system call



  get_unmapped_area: called by the mmap(2) system call



  check_flags: called by the fcntl(2) system call for F_SETFL command

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -9740,11 +9740,27 @@ T: Mercurial http://linuxtv.org/hg/v4l-dvb 
S:	Odd Fixes

F:	drivers/media/pci/zoran/



ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER

M:	Minchan Kim <minchan@kernel.org>

M:	Nitin Gupta <ngupta@vflare.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/block/zram/

F:	Documentation/blockdev/zram.txt



ZS DECSTATION Z85C30 SERIAL DRIVER

M:	"Maciej W. Rozycki" <macro@linux-mips.org>

S:	Maintained

F:	drivers/tty/serial/zs.*



ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR

M:	Minchan Kim <minchan@kernel.org>

M:	Nitin Gupta <ngupta@vflare.org>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zsmalloc.c

F:	include/linux/zsmalloc.h



ZSWAP COMPRESSED SWAP CACHING

M:	Seth Jennings <sjenning@linux.vnet.ibm.com>

L:	linux-mm@kvack.org

arch/x86/include/asm/pgtable_types.h

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ 


/* Set of bits not changed in pte_modify */

#define _PAGE_CHG_MASK	(PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT |		\

			 _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY)

			 _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY |	\

			 _PAGE_SOFT_DIRTY)

#define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE)



#define _PAGE_CACHE_MASK	(_PAGE_PCD | _PAGE_PWT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE