diag: Remove error message

Some diag messages are marked as error messages which should
be marked as debug. This patch fixes that issue.

Change-Id: If24b6cfdfca40321ff403826d8c149e8a3032803
Signed-off-by: Katish Paran <kparan@codeaurora.org>
msm: qdsp6v2: Increase max ports in APR

Increase the maximum ports in APR. Some Apps may support
multiple clients which exceeds the number of clients
supported in APR. This change increases number of ports
used in APR upto 8 sessions.

CRs-Fixed: 634388
Change-Id: I06624330845681b4414dd470ab7aed669d690ba0
Signed-off-by: Aravind Kumar <akumark@codeaurora.org>
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.054 on remote branch

Change-Id: I58c28118fb40d9a8992135b6532c8a65ea16d9b7
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.054 on remote branch"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.055 on remote branch

Change-Id: I20ff6bec5fd8093de519094f2fd4e28d00292fac
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.055 on remote branch"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.057 on remote branch

Change-Id: I586a8e1767f4c0ed4f0d92a83d95cc485fe3224f
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.057 on remote branch"
Merge "diag: Remove error message"
Merge "msm: qdsp6v2: Increase max ports in APR"
Merge "Merge "msm: kgsl: Fix GPU hang recovery logic""
Merge "Merge "Merge "msm: kgsl: Fix GPU hang recovery logic"""
Merge "Merge "msm: qdsp6v2: Increase max ports in APR""
tps61310: Move flashlight_off to suspend handler

* Early suspend is kind of stupid in this driver, move the call to
  flashlight_off to the full suspend handler instead.
* This should let the flashlight remain on when the display is inactive,
  by having userspace grab a PARTIAL_WAKE_LOCK if needed.

Change-Id: Ifb6d37f9323afa0f10d5797bab3880fe051c1dff
Merge "Merge "Merge "msm: qdsp6v2: Increase max ports in APR"""
Merge "Merge "msm: qdsp6v2: Increase max ports in APR""
Merge "Merge "Merge "msm: qdsp6v2: Increase max ports in APR"""
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.058 on remote branch

Change-Id: I18209ef21d286248210d222c33ad761c532c4ee5
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.058 on remote branch"
android/lowmemorykiller: Account for total_swapcache_pages

The lowmemorykiller relies on NR_FILE_PAGES when measureing
the amount of reclaimable memory in the system.
However when swap is enabled swap cache pages are counted
in NR_FILE_PAGES, and swap cache pages aren't as reclaimable
in low memory as file cache pages. Therefore a large swap
cache can result in the lowmemorykiller not running and
an OOM occuring.

In order to ensure the lowmemorykiller properly evaluates the
amount of reclaimable memory don't count the swap cache pages.

Change-Id: I38239283e572f814b277c718eaf6be7f92abacbb
Signed-off-by: Liam Mark <lmark@codeaurora.org>