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

Commit 16296e01 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge upstream linux-stable v3.10.36 into msm-3.10"

parents b50e0770 356fb135
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
* Marvell Orion SATA

Required Properties:
- compatibility : "marvell,orion-sata"
- compatibility : "marvell,orion-sata" or "marvell,armada-370-sata"
- reg           : Address range of controller
- interrupts    : Interrupt controller is using
- nr-ports      : Number of SATA ports in use.
+2 −2
Original line number Diff line number Diff line
@@ -1372,8 +1372,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
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Supported adapters:
  * Intel Lynx Point-LP (PCH)
  * Intel Avoton (SOC)
  * Intel Wellsburg (PCH)
  * Intel Coleto Creek (PCH)
   Datasheets: Publicly available at the Intel website

On Intel Patsburg and later chipsets, both the normal host SMBus controller
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 10
SUBLEVEL = 28
SUBLEVEL = 36
EXTRAVERSION =
NAME = TOSSUG Baby Fish

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *,
static inline void __flush_icache_all(void)
{
	__flush_icache_preferred();
	dsb();
}

/*
Loading