Commit 517d0869 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' 

* akpm: (182 commits)
  fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
  fbdev: *bfin*: fix __dev{init,exit} markings
  fbdev: *bfin*: drop unnecessary calls to memset
  fbdev: bfin-t350mcqb-fb: drop unused local variables
  fbdev: blackfin has __raw I/O accessors, so use them in fb.h
  fbdev: s1d13xxxfb: add accelerated bitblt functions
  tcx: use standard fields for framebuffer physical address and length
  fbdev: add support for handoff from firmware to hw framebuffers
  intelfb: fix a bug when changing video timing
  fbdev: use framebuffer_release() for freeing fb_info structures
  radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
  s3c-fb: CPUFREQ frequency scaling support
  s3c-fb: fix resource releasing on error during probing
  carminefb: fix possible access beyond end of carmine_modedb[]
  acornfb: remove fb_mmap function
  mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
  mb862xxfb: restrict compliation of platform driver to PPC
  Samsung SoC Framebuffer driver: add Alpha Channel support
  atmel-lcdc: fix pixclock upper bound detection
  offb: use framebuffer_alloc() to allocate fb_info struct
  ...

Manually fix up conflicts due to kmemcheck in mm/slab.c
parents 8eeee4e2 a34601c5

Documentation/accounting/getdelays.c

+2 −1
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ void print_ioacct(struct taskstats *t) 


int main(int argc, char *argv[])

{

	int c, rc, rep_len, aggr_len, len2, cmd_type;

	int c, rc, rep_len, aggr_len, len2;

	int cmd_type = TASKSTATS_CMD_ATTR_UNSPEC;

	__u16 id;

	__u32 mypid;

Documentation/atomic_ops.txt

+2 −2
Original line number Diff line number Diff line
@@ -229,10 +229,10 @@ kernel. It is the use of atomic counters to implement reference 
counting, and it works such that once the counter falls to zero it can

be guaranteed that no other entity can be accessing the object:



static void obj_list_add(struct obj *obj)

static void obj_list_add(struct obj *obj, struct list_head *head)

{

	obj->active = 1;

	list_add(&obj->list);

	list_add(&obj->list, head);

}



static void obj_list_del(struct obj *obj)

Documentation/fb/vesafb.txt

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ There is no way to change the vesafb video mode and/or timings after 
booting linux.  If you are not happy with the 60 Hz refresh rate, you

have these options:



 * configure and load the DOS-Tools for your the graphics board (if

 * configure and load the DOS-Tools for the graphics board (if

   available) and boot linux with loadlin.

 * use a native driver (matroxfb/atyfb) instead if vesafb.  If none

   is available, write a new one!

Documentation/filesystems/proc.txt

+10 −5
Original line number Diff line number Diff line
@@ -1003,11 +1003,13 @@ CHAPTER 3: PER-PROCESS PARAMETERS 
3.1 /proc/<pid>/oom_adj - Adjust the oom-killer score

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



This file can be used to adjust the score used to select which processes

should be killed in an  out-of-memory  situation.  Giving it a high score will

increase the likelihood of this process being killed by the oom-killer.  Valid

values are in the range -16 to +15, plus the special value -17, which disables

oom-killing altogether for this process.

This file can be used to adjust the score used to select which processes should

be killed in an out-of-memory situation.  The oom_adj value is a characteristic

of the task's mm, so all threads that share an mm with pid will have the same

oom_adj value.  A high value will increase the likelihood of this process being

killed by the oom-killer.  Valid values are in the range -16 to +15 as

explained below and a special value of -17, which disables oom-killing

altogether for threads sharing pid's mm.



The process to be killed in an out-of-memory situation is selected among all others

based on its badness score. This value equals the original memory size of the process
@@ -1021,6 +1023,9 @@ the parent's score if they do not share the same memory. Thus forking servers 
are the prime candidates to be killed. Having only one 'hungry' child will make

parent less preferable than the child.



/proc/<pid>/oom_adj cannot be changed for kthreads since they are immune from

oom-killing already.



/proc/<pid>/oom_score shows process' current badness score.



The following heuristics are then applied:

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -546,6 +546,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			console=brl,ttyS0

		For now, only VisioBraille is supported.



	consoleblank=	[KNL] The console blank (screen saver) timeout in

			seconds. Defaults to 10*60 = 10mins. A value of 0

			disables the blank timer.



	coredump_filter=

			[KNL] Change the default value for

			/proc/<pid>/coredump_filter.

CRA Git | Maintained and supported by SUSTech CRA and CCSE