sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-04-12 14:15:21 -07:00
parent 174808af90 026ee1f66a
commit ecca5c3acc
12 changed files with 105 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/panic.c
View File

@@ -97,7 +97,7 @@ void panic(const char *fmt, ...)
/*
* Avoid nested stack-dumping if a panic occurs during oops processing
*/
if (!oops_in_progress)
if (!test_taint(TAINT_DIE) && oops_in_progress <= 1)
dump_stack();
#endif