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

Merge branch 'akpm' (patches from Andrew) 

Merge third set of updates from Andrew Morton:

 - the rest of MM

   [ This includes getting rid of the numa hinting bits, in favor of
     just generic protnone logic.  Yay.     - Linus ]

 - core kernel

 - procfs

 - some of lib/ (lots of lib/ material this time)

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (104 commits)
  lib/lcm.c: replace include
  lib/percpu_ida.c: remove redundant includes
  lib/strncpy_from_user.c: replace module.h include
  lib/stmp_device.c: replace module.h include
  lib/sort.c: move include inside #if 0
  lib/show_mem.c: remove redundant include
  lib/radix-tree.c: change to simpler include
  lib/plist.c: remove redundant include
  lib/nlattr.c: remove redundant include
  lib/kobject_uevent.c: remove redundant include
  lib/llist.c: remove redundant include
  lib/md5.c: simplify include
  lib/list_sort.c: rearrange includes
  lib/genalloc.c: remove redundant include
  lib/idr.c: remove redundant include
  lib/halfmd4.c: simplify includes
  lib/dynamic_queue_limits.c: simplify includes
  lib/sort.c: use simpler includes
  lib/interval_tree.c: simplify includes
  hexdump: make it return number of bytes placed in buffer
  ...
parents 802ea9d8 6016daed

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ Module.symvers 
#

/debian/



#

# tar directory (make tar*-pkg)

#

/tar-install/



#

# git files that we don't want to ignore even it they are dot-files

#

Documentation/filesystems/proc.txt

+37 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ Table 1-1: Process specific entries in /proc 
 stack		Report full stack trace, enable via CONFIG_STACKTRACE

 smaps		a extension based on maps, showing the memory consumption of

		each mapping and flags associated with it

 numa_maps	an extension based on maps, showing the memory locality and

		binding policy as well as mem usage (in pages) of each mapping.

..............................................................................



For example, to get the status information of a process, all you have to do is
@@ -489,12 +491,47 @@ To clear the bits for the file mapped pages associated with the process 
To clear the soft-dirty bit

    > echo 4 > /proc/PID/clear_refs



To reset the peak resident set size ("high water mark") to the process's

current value:

    > echo 5 > /proc/PID/clear_refs



Any other value written to /proc/PID/clear_refs will have no effect.



The /proc/pid/pagemap gives the PFN, which can be used to find the pageflags

using /proc/kpageflags and number of times a page is mapped using

/proc/kpagecount. For detailed explanation, see Documentation/vm/pagemap.txt.



The /proc/pid/numa_maps is an extension based on maps, showing the memory

locality and binding policy, as well as the memory usage (in pages) of

each mapping. The output follows a general format where mapping details get

summarized separated by blank spaces, one mapping per each file line:



address   policy    mapping details



00400000 default file=/usr/local/bin/app mapped=1 active=0 N3=1 kernelpagesize_kB=4

00600000 default file=/usr/local/bin/app anon=1 dirty=1 N3=1 kernelpagesize_kB=4

3206000000 default file=/lib64/ld-2.12.so mapped=26 mapmax=6 N0=24 N3=2 kernelpagesize_kB=4

320621f000 default file=/lib64/ld-2.12.so anon=1 dirty=1 N3=1 kernelpagesize_kB=4

3206220000 default file=/lib64/ld-2.12.so anon=1 dirty=1 N3=1 kernelpagesize_kB=4

3206221000 default anon=1 dirty=1 N3=1 kernelpagesize_kB=4

3206800000 default file=/lib64/libc-2.12.so mapped=59 mapmax=21 active=55 N0=41 N3=18 kernelpagesize_kB=4

320698b000 default file=/lib64/libc-2.12.so

3206b8a000 default file=/lib64/libc-2.12.so anon=2 dirty=2 N3=2 kernelpagesize_kB=4

3206b8e000 default file=/lib64/libc-2.12.so anon=1 dirty=1 N3=1 kernelpagesize_kB=4

3206b8f000 default anon=3 dirty=3 active=1 N3=3 kernelpagesize_kB=4

7f4dc10a2000 default anon=3 dirty=3 N3=3 kernelpagesize_kB=4

7f4dc10b4000 default anon=2 dirty=2 active=1 N3=2 kernelpagesize_kB=4

7f4dc1200000 default file=/anon_hugepage\040(deleted) huge anon=1 dirty=1 N3=1 kernelpagesize_kB=2048

7fff335f0000 default stack anon=3 dirty=3 N3=3 kernelpagesize_kB=4

7fff3369d000 default mapped=1 mapmax=35 active=0 N3=1 kernelpagesize_kB=4



Where:

"address" is the starting address for the mapping;

"policy" reports the NUMA memory policy set for the mapping (see vm/numa_memory_policy.txt);

"mapping details" summarizes mapping data such as mapping type, page usage counters,

node locality page counters (N0 == node0, N1 == node1, ...) and the kernel page

size, in KB, that is backing the mapping up.



1.2 Kernel data

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

arch/alpha/include/asm/thread_info.h

+0 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ struct thread_info { 
	int bpt_nsaved;

	unsigned long bpt_addr[2];		/* breakpoint handling  */

	unsigned int bpt_insn[2];



	struct restart_block	restart_block;

};



/*
@@ -40,9 +38,6 @@ struct thread_info { 
	.exec_domain	= &default_exec_domain,	\

	.addr_limit	= KERNEL_DS,		\

	.preempt_count	= INIT_PREEMPT_COUNT,	\

	.restart_block = {			\

		.fn = do_no_restart_syscall,	\

	},					\

}



#define init_thread_info	(init_thread_union.thread_info)

arch/alpha/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs) 
	struct switch_stack *sw = (struct switch_stack *)regs - 1;

	long i, err = __get_user(regs->pc, &sc->sc_pc);



	current_thread_info()->restart_block.fn = do_no_restart_syscall;

	current->restart_block.fn = do_no_restart_syscall;



	sw->r26 = (unsigned long) ret_from_sys_call;

arch/arc/include/asm/thread_info.h

+0 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct thread_info { 
	struct exec_domain *exec_domain;/* execution domain */

	__u32 cpu;			/* current CPU */

	unsigned long thr_ptr;		/* TLS ptr */

	struct restart_block restart_block;

};



/*
@@ -62,9 +61,6 @@ struct thread_info { 
	.cpu        = 0,			\

	.preempt_count  = INIT_PREEMPT_COUNT,	\

	.addr_limit = KERNEL_DS,		\

	.restart_block  = {			\

		.fn = do_no_restart_syscall,	\

	},					\

}



#define init_thread_info    (init_thread_union.thread_info)

CRA Git | Maintained and supported by SUSTech CRA and CCSE