linux-toradex.git/fs/proc, branch tegra Linux kernel for Apalis and Colibri modules proc: enhance time-average nr_running stats 2012-07-01T16:15:16+00:00 Alex Frid afrid@nvidia.com 2012-05-16T21:27:13+00:00 66df1168a350946cf1f2951371f6d530f1878fe8 Add time-average nr_running to loadavg printout Bug 958978 Change-Id: I5c6904efb52a86f4964eb66c1576fc91f60f5b1d Signed-off-by: Alex Frid <afrid@nvidia.com> (cherry picked from commit 86f3642cc44a69d1e4798719bd9182cd6923f526) Reviewed-on: http://git-master/r/111636 Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com> Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com> 
Add time-average nr_running to loadavg printout

Bug 958978

Change-Id: I5c6904efb52a86f4964eb66c1576fc91f60f5b1d
Signed-off-by: Alex Frid <afrid@nvidia.com>
(cherry picked from commit 86f3642cc44a69d1e4798719bd9182cd6923f526)
Reviewed-on: http://git-master/r/111636
Reviewed-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Tested-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Revert "proc: enable writing to /proc/pid/mem" 2012-02-03T13:54:26+00:00 Dima Zavin dima@android.com 2012-01-19T17:51:07+00:00 acf1905328610145bd85c0178479d3a70c7098ee This reverts commit 198214a7ee50375fa71a65e518341980cfd4b2f0. (cherry picked from commit dac306d896642f3dfcd878ab6a0a5b8c123722f3 from android.googlesource.com/common.git) Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: Ia8947a59125e9318f1c51cb63ceb15a6e136aad9 Reviewed-on: http://git-master/r/78884 Reviewed-by: Automatic_Commit_Validation_User 
This reverts commit 198214a7ee50375fa71a65e518341980cfd4b2f0.
(cherry picked from commit dac306d896642f3dfcd878ab6a0a5b8c123722f3 from
android.googlesource.com/common.git)

Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Change-Id: Ia8947a59125e9318f1c51cb63ceb15a6e136aad9
Reviewed-on: http://git-master/r/78884
Reviewed-by: Automatic_Commit_Validation_User
Linux 3.1.7 2012-01-05T04:35:50+00:00 Varun Wadekar vwadekar@nvidia.com 2012-01-05T04:35:34+00:00 18b3e7967257168128dc3a16906de2880985ef6c Change-Id: I99507d7cfdcee064f808856dc2ce99d806fd864f 
Change-Id: I99507d7cfdcee064f808856dc2ce99d806fd864f
fs/proc/meminfo.c: fix compilation error 2011-12-21T20:58:21+00:00 Claudio Scordino claudio@evidence.eu.com 2011-12-08T22:33:56+00:00 7171d74d6be6346a3e33e32f7270ee09852999f4 commit b53fc7c2974a50913f49e1d800fe904a28c338e3 upstream. Fix the error message "directives may not be used inside a macro argument" which appears when the kernel is compiled for the cris architecture. Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
commit b53fc7c2974a50913f49e1d800fe904a28c338e3 upstream.

Fix the error message "directives may not be used inside a macro argument"
which appears when the kernel is compiled for the cris architecture.

Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
HACK merge fixups for compile 2011-12-01T05:52:34+00:00 Dan Willemsen dwillemsen@nvidia.com 2011-10-23T07:19:18+00:00 6b8121f30d001e2cbae6ede6822f70c73dc3100a Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54 
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Merge branch 'korg-android-tegra-3.1' into after-upstream-android 2011-12-01T05:51:56+00:00 Dan Willemsen dwillemsen@nvidia.com 2011-12-01T05:51:56+00:00 68529c0f36074be88ee937634fb9433e69c96388 Conflicts: arch/arm/mach-tegra/Kconfig arch/arm/mach-tegra/board-ventana.c drivers/misc/Kconfig drivers/video/tegra/dc/hdmi.c Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com> 
Conflicts:
	arch/arm/mach-tegra/Kconfig
	arch/arm/mach-tegra/board-ventana.c
	drivers/misc/Kconfig
	drivers/video/tegra/dc/hdmi.c

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
ARM: report present cpus instead of online CPUs 2011-12-01T05:47:58+00:00 Jon Mayo jmayo@nvidia.com 2011-06-21T22:44:35+00:00 84fca9fbd451e7a12febf620e28235ed74022371 For machines that use hotplug to control special power domains, report present cpus in /proc/cpuinfo and /proc/stat instead of the standard of reporting online. This break hotplug behavior on all other platforms. The option is enabled using CONFIG_REPORT_PRESENT_CPUS Bug 849167 Original-Change-Id: Ib04bb73634b3a8c99592b1ac13eb471a8ecfd0c5 Reviewed-on: http://git-master/r/37732 Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Tested-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Rebase-Id: R746f854d51a4b8f15774a547a3219acf7576bf6e 
For machines that use hotplug to control special power domains, report
present cpus in /proc/cpuinfo and /proc/stat instead of the standard of
reporting online. This break hotplug behavior on all other platforms.

The option is enabled using CONFIG_REPORT_PRESENT_CPUS

Bug 849167

Original-Change-Id: Ib04bb73634b3a8c99592b1ac13eb471a8ecfd0c5
Reviewed-on: http://git-master/r/37732
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>

Rebase-Id: R746f854d51a4b8f15774a547a3219acf7576bf6e
proc: smaps: Allow smaps access for CAP_SYS_RESOURCE 2011-12-01T05:38:13+00:00 San Mehat san@google.com 2009-09-16T19:39:10+00:00 8cec508c086d0621fcfe333f0252c51ab90b693d Signed-off-by: San Mehat <san@google.com> 
Signed-off-by: San Mehat <san@google.com>
Grants system server access to /proc/<pid>/oom_adj for Android applications. 2011-12-01T05:37:56+00:00 Mike Chan mikechan@google.com 2008-04-24T17:22:26+00:00 8c080b4112a6373eb70a8d7025e35a76c4657987 Signed-off-by: Brian Swetland <swetland@google.com> 
Signed-off-by: Brian Swetland <swetland@google.com>
/proc/self/numa_maps: restore "huge" tag for hugetlb vmas 2011-11-11T17:43:29+00:00 Andrew Morton akpm@linux-foundation.org 2011-11-01T00:06:32+00:00 9d6af07ac7e925a9a7dcb46d6b25021112b203e1 commit fc360bd9cdcf875639a77f07fafec26699c546f3 upstream. The display of the "huge" tag was accidentally removed in 29ea2f698 ("mm: use walk_page_range() instead of custom page table walking code"). Reported-by: Stephen Hemminger <shemminger@vyatta.com> Tested-by: Stephen Hemminger <shemminger@vyatta.com> Reviewed-by: Stephen Wilson <wilsons@start.ca> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
commit fc360bd9cdcf875639a77f07fafec26699c546f3 upstream.

The display of the "huge" tag was accidentally removed in 29ea2f698 ("mm:
use walk_page_range() instead of custom page table walking code").

Reported-by: Stephen Hemminger <shemminger@vyatta.com>
Tested-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Stephen Wilson <wilsons@start.ca>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>