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

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

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

Merge fixes from Andrew Morton.

* emailed from Andrew Morton <akpm@linux-foundation.org>: (14 patches)
  panic: fix stack dump print on direct call to panic()
  drivers/rtc/rtc-pl031.c: enable clock on all ST variants
  Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()"
  hugetlb: fix race condition in hugetlb_fault()
  drivers/rtc/rtc-twl.c: use static register while reading time
  drivers/rtc/rtc-s3c.c: add placeholder for driver private data
  drivers/rtc/rtc-s3c.c: fix compilation error
  MAINTAINERS: add PCDP console maintainer
  memcg: do not open code accesses to res_counter members
  drivers/rtc/rtc-efi.c: fix section mismatch warning
  drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected
  drivers/char/random.c: fix boot id uniqueness race
  memcg: fix broken boolen expression
  memcg: fix up documentation on global LRU
parents 174808af 026ee1f6

Documentation/cgroups/memory.txt

+2 −3
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April) 


Features:

 - accounting anonymous pages, file caches, swap caches usage and limiting them.

 - private LRU and reclaim routine. (system's global LRU and private LRU

   work independently from each other)

 - pages are linked to per-memcg LRU exclusively, and there is no global LRU.

 - optionally, memory+swap usage can be accounted and limited.

 - hierarchical accounting

 - soft limit
@@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup. 
2.2.1 Accounting details



All mapped anon pages (RSS) and cache pages (Page Cache) are accounted.

Some pages which are never reclaimable and will not be on the global LRU

Some pages which are never reclaimable and will not be on the LRU

are not accounted. We just account pages under usual VM management.



RSS pages are accounted at page_fault unless they've already been accounted

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -5117,6 +5117,11 @@ F: drivers/i2c/busses/i2c-pca-* 
F:	include/linux/i2c-algo-pca.h

F:	include/linux/i2c-pca-platform.h



PCDP - PRIMARY CONSOLE AND DEBUG PORT

M:	Khalid Aziz <khalid.aziz@hp.com>

S:	Maintained

F:	drivers/firmware/pcdp.*



PCI ERROR RECOVERY

M:     Linas Vepstas <linasvepstas@gmail.com>

L:	linux-pci@vger.kernel.org

drivers/char/random.c

+8 −3
Original line number Diff line number Diff line
@@ -1260,10 +1260,15 @@ static int proc_do_uuid(ctl_table *table, int write, 
	uuid = table->data;

	if (!uuid) {

		uuid = tmp_uuid;

		uuid[8] = 0;

	}

	if (uuid[8] == 0)

		generate_random_uuid(uuid);

	} else {

		static DEFINE_SPINLOCK(bootid_spinlock);



		spin_lock(&bootid_spinlock);

		if (!uuid[8])

			generate_random_uuid(uuid);

		spin_unlock(&bootid_spinlock);

	}



	sprintf(buf, "%pU", uuid);

drivers/rtc/rtc-efi.c

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ static struct platform_driver efi_rtc_driver = { 
		.name = "rtc-efi",

		.owner = THIS_MODULE,

	},

	.probe = efi_rtc_probe,

	.remove = __exit_p(efi_rtc_remove),

};

drivers/rtc/rtc-pl031.c

+1 −2
Original line number Diff line number Diff line
@@ -339,8 +339,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) 
	dev_dbg(&adev->dev, "revision = 0x%01x\n", ldata->hw_revision);



	/* Enable the clockwatch on ST Variants */

	if ((ldata->hw_designer == AMBA_VENDOR_ST) &&

	    (ldata->hw_revision > 1))

	if (ldata->hw_designer == AMBA_VENDOR_ST)

		writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN,

		       ldata->base + RTC_CR);