staging: prima: Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066

Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066 on remote branch"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.066 on remote branch
Merge "Merge "wlan: add check for size of cache aligned skb->data""
Merge "wlan: add check for size of cache aligned skb->data"
wlan: add check for size of cache aligned skb->data
Merge "Merge "wlan:Fix kernel panic while TDLS exit.""
Merge "wlan:Fix kernel panic while TDLS exit."
Merge "wlan: do not process HT IE change if RoC is in progress"
wlan:Fix kernel panic while TDLS exit.
Merge "Merge "wlan: Disable TX Async logic.""
Merge "wlan: Disable TX Async logic."
wlan: Disable TX Async logic.
Merge "Merge "wlan: Avoid the race conditon when deauth ind is stuck.""
Merge "wlan: Avoid the race conditon when deauth ind is stuck."
wlan: Avoid the race conditon when deauth ind is stuck.
Merge "Merge "Send response to SME when switch channel fails.""
Merge "Send response to SME when switch channel fails."
Merge "wlan: Fail to load driver if INI file is corrupted"
wlan: Fail to load driver if INI file is corrupted
wlan: do not process HT IE change if RoC is in progress
Send response to SME when switch channel fails.
Merge "Merge "wlan: Fix kernel panic calling ioctl setTrafficMon.""
Merge "wlan: Fix kernel panic calling ioctl setTrafficMon."
Merge "wlan: Fix dangling pAdapter pointer in HDD."
Merge "wlan: Return failure if NV is not proper"
Merge "wlan: Avoid race condition in locking of tx queues per staId."
Merge "wlan: Add NULL check for FTM ioctls."
Merge "wlan: Increase the SSR WAIT time"
wlan: Fix kernel panic calling ioctl setTrafficMon.
wlan: Add NULL check for FTM ioctls.
wlan: Increase the SSR WAIT time
wlan: Fix dangling pAdapter pointer in HDD.

Change-Id: I363cdb920ab83b2b772361b2ed7b7bb61e0c118c
tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1

syscall_get_nr can return -1 in the case that the task is not executing
a system call.

This patch fixes perf_syscall_{enter,exit} to check that the syscall
number is valid before using it as an index into a bitmap.

Link: http://lkml.kernel.org/r/1345137254-7377-1-git-send-email-will.deacon@arm.com

Change-Id: I12f99dea41390b9631f98f925dc1d572aa4fc22d
Cc: Jason Baron <jbaron@redhat.com>
Cc: Wade Farnsworth <wade_farnsworth@mentor.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
tracing/syscalls: Ignore numbers outside NR_syscalls' range

ARM has some private syscalls (for example, set_tls(2)) which lie
outside the range of NR_syscalls.  If any of these are called while
syscall tracing is being performed, out-of-bounds array access will
occur in the ftrace and perf sys_{enter,exit} handlers.

 # trace-cmd record -e raw_syscalls:* true && trace-cmd report
 ...
 true-653   [000]   384.675777: sys_enter:            NR 192 (0, 1000, 3, 4000022, ffffffff, 0)
 true-653   [000]   384.675812: sys_exit:             NR 192 = 1995915264
 true-653   [000]   384.675971: sys_enter:            NR 983045 (76f74480, 76f74000, 76f74b28, 76f74480, 76f76f74, 1)
 true-653   [000]   384.675988: sys_exit:             NR 983045 = 0
 ...

 # trace-cmd record -e syscalls:* true
 [   17.289329] Unable to handle kernel paging request at virtual address aaaaaace
 [   17.289590] pgd = 9e71c000
 [   17.289696] [aaaaaace] *pgd=00000000
 [   17.289985] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
 [   17.290169] Modules linked in:
 [   17.290391] CPU: 0 PID: 704 Comm: true Not tainted 3.18.0-rc2+ #21
 [   17.290585] task: 9f4dab00 ti: 9e710000 task.ti: 9e710000
 [   17.290747] PC is at ftrace_syscall_enter+0x48/0x1f8
 [   17.290866] LR is at syscall_trace_enter+0x124/0x184

Fix this by ignoring out-of-NR_syscalls-bounds syscall numbers.

Commit cd0980fc8add "tracing: Check invalid syscall nr while tracing syscalls"
added the check for less than zero, but it should have also checked
for greater than NR_syscalls.

Link: http://lkml.kernel.org/p/1414620418-29472-1-git-send-email-rabin@rab.in

Change-Id: Ic7ab546938e4655d73791d4cf371ffd9244c3e4d
Fixes: cd0980fc8add "tracing: Check invalid syscall nr while tracing syscalls"
Cc: stable@vger.kernel.org # 2.6.33+
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
power: 8921-htc: Tone down logging

Change-Id: Ia623b3189894141accc2ff6d4b6ec1d0ac6c597b
drivers: input: akm8963: Initialize AKECS_ioctl vars

From m7stockui-3.4.10-gef77362.

Change-Id: Ic1b80479c6a7ca60e19ec741f840379dbf6516ad