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

Commit 7d36014b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch-bomb) 

Merge patches through Andrew Morton:
 "180 patches - err 181 - listed below:

   - most of MM.  I held back the (large) "memcg: add hugetlb extension"
     series because a bunfight has recently broken out.

   - leds.  After this, Bryan Wu will be handling drivers/leds/

   - backlight

   - lib/

   - rtc"

* emailed from Andrew Morton <akpm@linux-foundation.org>: (181 patches)
  drivers/rtc/rtc-s3c.c: fix compiler warning
  drivers/rtc/rtc-tegra.c: clean up probe/remove routines
  drivers/rtc/rtc-pl031.c: remove RTC timer interrupt handling
  drivers/rtc/rtc-lpc32xx.c: add device tree support
  drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
  rtc: ds1307: add trickle charger support
  rtc: ds1307: remove superfluous initialization
  rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
  drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
  drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
  rtc: add ioctl to get/clear battery low voltage status
  drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
  rtc/spear: add Device Tree probing capability
  lib/vsprintf.c: "%#o",0 becomes '0' instead of '00'
  radix-tree: fix preload vector size
  spinlock_debug: print kallsyms name for lock
  vsprintf: fix %ps on non symbols when using kallsyms
  lib/bitmap.c: fix documentation for scnprintf() functions
  lib/string_helpers.c: make arrays static
  lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
  ...
parents 442a9ffa ecb41a77

Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533

0 → 100644
+48 −0
Original line number Diff line number Diff line 
What:		/sys/class/backlight/<backlight>/als_channel

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the ALS output channel used as input in

		ALS-current-control mode (0, 1), where



		0 - out_current0 (backlight 0)

		1 - out_current1 (backlight 1)



What:		/sys/class/backlight/<backlight>/als_en

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Enable ALS-current-control mode (0, 1).



What:		/sys/class/backlight/<backlight>/id

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the id of this backlight (0, 1).



What:		/sys/class/backlight/<backlight>/linear

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the brightness-mapping mode (0, 1), where



		0 - exponential mode

		1 - linear mode



What:		/sys/class/backlight/<backlight>/pwm

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the PWM-input control mask (5 bits), where



		bit 5 - PWM-input enabled in Zone 4

		bit 4 - PWM-input enabled in Zone 3

		bit 3 - PWM-input enabled in Zone 2

		bit 2 - PWM-input enabled in Zone 1

		bit 1 - PWM-input enabled in Zone 0

		bit 0 - PWM-input enabled

Documentation/ABI/testing/sysfs-class-led-driver-lm3533

0 → 100644
+65 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/als_channel

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the ALS output channel to use as input in

		ALS-current-control mode (1, 2), where



		1 - out_current1

		2 - out_current2



What:		/sys/class/leds/<led>/als_en

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Enable ALS-current-control mode (0, 1).



What:		/sys/class/leds/<led>/falltime

What:		/sys/class/leds/<led>/risetime

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the pattern generator fall and rise times (0..7), where



		0 - 2048 us

		1 - 262 ms

		2 - 524 ms

		3 - 1.049 s

		4 - 2.097 s

		5 - 4.194 s

		6 - 8.389 s

		7 - 16.78 s



What:		/sys/class/leds/<led>/id

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the id of this led (0..3).



What:		/sys/class/leds/<led>/linear

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the brightness-mapping mode (0, 1), where



		0 - exponential mode

		1 - linear mode



What:		/sys/class/leds/<led>/pwm

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the PWM-input control mask (5 bits), where



		bit 5 - PWM-input enabled in Zone 4

		bit 4 - PWM-input enabled in Zone 3

		bit 3 - PWM-input enabled in Zone 2

		bit 2 - PWM-input enabled in Zone 1

		bit 1 - PWM-input enabled in Zone 0

		bit 0 - PWM-input enabled

Documentation/cgroups/memory.txt

+16 −21
Original line number Diff line number Diff line
@@ -184,12 +184,14 @@ behind this approach is that a cgroup that aggressively uses a shared 
page will eventually get charged for it (once it is uncharged from

the cgroup that brought it in -- this will happen on memory pressure).



But see section 8.2: when moving a task to another cgroup, its pages may

be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.



Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used.

When you do swapoff and make swapped-out pages of shmem(tmpfs) to

be backed into memory in force, charges for pages are accounted against the

caller of swapoff rather than the users of shmem.





2.4 Swap Extension (CONFIG_CGROUP_MEM_RES_CTLR_SWAP)



Swap Extension allows you to record charge for swap. A swapped-in page is
@@ -374,14 +376,15 @@ cgroup might have some charge associated with it, even though all 
tasks have migrated away from it. (because we charge against pages, not

against tasks.)



Such charges are freed or moved to their parent. At moving, both of RSS

and CACHES are moved to parent.

rmdir() may return -EBUSY if freeing/moving fails. See 5.1 also.

We move the stats to root (if use_hierarchy==0) or parent (if

use_hierarchy==1), and no change on the charge except uncharging

from the child.



Charges recorded in swap information is not updated at removal of cgroup.

Recorded information is discarded and a cgroup which uses swap (swapcache)

will be charged as a new owner of it.



About use_hierarchy, see Section 6.



5. Misc. interfaces.
@@ -394,13 +397,15 @@ will be charged as a new owner of it. 


  Almost all pages tracked by this memory cgroup will be unmapped and freed.

  Some pages cannot be freed because they are locked or in-use. Such pages are

  moved to parent and this cgroup will be empty. This may return -EBUSY if

  VM is too busy to free/move all pages immediately.

  moved to parent(if use_hierarchy==1) or root (if use_hierarchy==0) and this

  cgroup will be empty.



  Typical use case of this interface is that calling this before rmdir().

  Because rmdir() moves all pages to parent, some out-of-use page caches can be

  moved to the parent. If you want to avoid that, force_empty will be useful.



  About use_hierarchy, see Section 6.



5.2 stat file



memory.stat file includes following statistics
@@ -430,17 +435,10 @@ hierarchical_memory_limit - # of bytes of memory limit with regard to hierarchy 
hierarchical_memsw_limit - # of bytes of memory+swap limit with regard to

			hierarchy under which memory cgroup is.



total_cache		- sum of all children's "cache"

total_rss		- sum of all children's "rss"

total_mapped_file	- sum of all children's "cache"

total_pgpgin		- sum of all children's "pgpgin"

total_pgpgout		- sum of all children's "pgpgout"

total_swap		- sum of all children's "swap"

total_inactive_anon	- sum of all children's "inactive_anon"

total_active_anon	- sum of all children's "active_anon"

total_inactive_file	- sum of all children's "inactive_file"

total_active_file	- sum of all children's "active_file"

total_unevictable	- sum of all children's "unevictable"

total_<counter>		- # hierarchical version of <counter>, which in

			addition to the cgroup's own value includes the

			sum of all hierarchical children's values of

			<counter>, i.e. total_cache



# The following additional stats are dependent on CONFIG_DEBUG_VM.
@@ -622,8 +620,7 @@ memory cgroup. 
  bit | what type of charges would be moved ?

 -----+------------------------------------------------------------------------

   0  | A charge of an anonymous page(or swap of it) used by the target task.

      | Those pages and swaps must be used only by the target task. You must

      | enable Swap Extension(see 2.4) to enable move of swap charges.

      | You must enable Swap Extension(see 2.4) to enable move of swap charges.

 -----+------------------------------------------------------------------------

   1  | A charge of file pages(normal file, tmpfs file(e.g. ipc shared memory)

      | and swaps of tmpfs file) mmapped by the target task. Unlike the case of
@@ -636,8 +633,6 @@ memory cgroup. 


8.3 TODO



- Implement madvise(2) to let users decide the vma to be moved or not to be

  moved.

- All of moving charge operations are done under cgroup_mutex. It's not good

  behavior to hold the mutex too long, so we may need some trick.

Documentation/cgroups/resource_counter.txt

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ to work with it. 


	The _locked routines imply that the res_counter->lock is taken.



 f. void res_counter_uncharge_until

		(struct res_counter *rc, struct res_counter *top,

		 unsinged long val)



	Almost same as res_cunter_uncharge() but propagation of uncharge

	stops when rc == top. This is useful when kill a res_coutner in

	child cgroup.



 2.1 Other accounting routines



    There are more routines that may help you with common needs, like

Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* NXP LPC32xx SoC Real Time Clock controller



Required properties:

- compatible: must be "nxp,lpc3220-rtc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: The RTC interrupt



Example:



	rtc@40024000 {

		compatible = "nxp,lpc3220-rtc";

		reg = <0x40024000 0x1000>;

		interrupts = <52 0>;

	};