bring in my defconfig
tmo defconfig
Reset G2 changes to msm_serial_hs
msm_serial_hs: Add ioctl support for UART Clock on/off request

This change adds support for ioctl implementation in HSUART
driver. UART Client application (e.g. Bluetooth) can make
request for UART Clock on/off using the ioctl mechanism.
UART Clock status also can be queried using this mechanism.

CRs-Fixed: 496245
Change-Id: I9531cf2f9eda487082b9719341c5ad84c15ad5f7
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
msm_serial_hs: Vote for clocks during tty close

While BT operation is in progress, it's possible for
client functions to explicitly turn off the
UART clocks without notifying TTY layer.  Then when
TTY layer try to access UART, L2 error happened because
of un-clocked registers.  Since there is no clear way
to notify clients to turn on clocks before TTY access
UART driver will implicilty turn on the clocks.

CRs-Fixed: 505225
Change-Id: Ia9958658465a6c0e5af66cd932e8e694cc12b78c
Signed-off-by: Naveen Kaje <nkaje@codeaurora.org>
msm_serial_hs: check clk_state in set_mctrl() and fix unbalanced unvote

commit "msm_serial_hs: Vote for clocks during tty close"
has unbalanced unvote clock during msm_hs_shutdown(). Fix it.
Also, the following case has also unclocked register access problem.

  msm_hs_set_mctrl_locked()
  uart_dtr_rts()
  tty_port_close_start()
  uart_close()
  tty_release()

Because msm_hs_set_mctrl_locked() is called with spinlock,
can't vote for clock. Thus, just skip it if clock is off.

Change-Id: I0f75cb4a0303b6385367f087586765f3e5ff37f7
Signed-off-by: Bongkyu Kim <bongkyu.kim@lge.com>
Signed-off-by: Devin Kim <dojip.kim@lge.com>
msm_serial_hs: fix unbalanced clock vote

commit "msm_serial_hs: check clk_state in set_mctrl() and
fix unbalanced unvote" removed the codes to balance clk_state.
It causes the unbalanced clock vote. So restore this.

Change-Id: I339c135c29bc48294639c0d80ae7a51b7c534af0
Signed-off-by: Devin Kim <dojip.kim@lge.com>
Signed-off-by: shihhao.feng <shihhao.feng@lge.com>
msm_serial_hs: fix unbalanced clock vote during shutdown

If msm_hs_shutdown() is called during MSM_HS_CLK_OFF status,
it causes unbalanced clock vote.
This situation can be occurred if bluesleep already turn off clock.
To fix this, unvote clock first and check clk_state.

Change-Id: I65a5ac421a7e3a04083fe5f5893e2cc930303e54
Signed-off-by: Bongkyu Kim <bongkyu.kim@lge.com>
bluesleep: Remove remnants of LGE_BLUESLEEP

The patching of msm_serial_hs should make the clock workarounds
unnecessary
defconfig: Disable BTlock
Revert "defconfig: Disable BTlock"

This reverts commit 5c835190f4d0e678414a86a04ebae3ac33bb4a05.
rfkill: Don't run btlock

It conflicts with userspace's invocations from bluedroid
bcmdhd: Reset the hang flag after the notifications are sent
ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS

The {get,put}_user macros don't perform range checking on the provided
__user address when !CPU_HAS_DOMAINS.

This patch reworks the out-of-line assembly accessors to check the user
address against a specified limit, returning -EFAULT if is is out of
range.

[will: changed get_user register allocation to match put_user]
[rmk: fixed building on older ARM architectures]

CRs-Fixed: 504011
Change-Id: I3818045a136fcdf72deb1371b132e090fd7ed643
Reported-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Git-commit: 8404663f81d212918ff85f493649a7991209fa04
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
update defconfigs
cfg80211: Fix memory leak

When a driver requests a specific regulatory domain after cfg80211 already
has one, a struct ieee80211_regdomain is leaked.

Change-Id: Id28fc9861b9c911a97bd242439eabca097d76258
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: b7566fc363e23f0efd3fa1e1460f9421cdc0d77e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[mattw@codeaurora.org: trivially backport to the msm-3.4 kernel]
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
sync: Fix a race condition between release_obj and print_obj

Before this change, a timeline would only be removed from the timeline
list *after* the sync driver had its release_obj() called. However, the
driver's release_obj() may free resources needed by print_obj().

Although the timeline list is locked when print_obj() is called, it is
not locked when release_obj() is called. If one CPU was in print_obj()
when another was in release_obj(), the print_obj() may make unsafe
accesses.

It is not actually necessary to hold the timeline list lock when calling
release_obj() if the call is made after the timeline is unlinked from
the list, since there is no possibility another thread could be in --
or enter -- print_obj() for that timeline.

This change moves the release_obj() call to after the timeline is
unlinked, preventing the above race from occurring.

Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
msm: actuator: fix to prevent untrusted pointer to lead DoS

fix to prevent untrusted userspace pointer in actuator kernel
driver to lead DoS

Change-Id: I1b64270deb494530d268539e7b420be5ec79b658
Signed-off-by: Vasko Kalanoski <vaskok@codeaurora.org>
msm: actuator: fix to prevent kernel heap buffer overflow

fix to prevent kernel heap buffer overflow allows user
controlled data to be written to the heap via the
msm_camera actuator IOCTLs

Change-Id: I4458831e28e0081fb2f5ae55506be866100e1b4f
Signed-off-by: Vasko Kalanoski <vaskok@codeaurora.org>
SELinux: include definition of new capabilities

The kernel has added CAP_WAKE_ALARM and CAP_EPOLLWAKEUP.  We need to
define these in SELinux so they can be mediated by policy.

Change-Id: I8a3e0db15ec5f4eb05d455a57e8446a8c2b484c2
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
[sds: rename epollwakeup to block_suspend to match upstream merge]
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>