Revert "sched/debug: Fix sd->*_idx limit range avoiding overflow"

This reverts commit 86c64334221d525614cb0ffdd2204987a7e51bd9.
Revert "sched/debug: Limit sd->*_idx range on sysctl"

This reverts commit df7f3080152ee1f5d64d6d2fef05d3cad42cae72.
swap: avoid read_swap_cache_async() race to deadlock while waiting on discard I/O completion

commit cbab0e4eec299e9059199ebe6daf48730be46d2b upstream.

read_swap_cache_async() can race against get_swap_page(), and stumble
across a SWAP_HAS_CACHE entry in the swap map whose page wasn't brought
into the swapcache yet.

This transient swap_map state is expected to be transitory, but the
actual placement of discard at scan_swap_map() inserts a wait for I/O
completion thus making the thread at read_swap_cache_async() to loop
around its -EEXIST case, while the other end at get_swap_page() is
scheduled away at scan_swap_map().  This can leave the system deadlocked
if the I/O completion happens to be waiting on the CPU waitqueue where
read_swap_cache_async() is busy looping and !CONFIG_PREEMPT.

This patch introduces a cond_resched() call to make the aforementioned
read_swap_cache_async() busy loop condition to bail out when necessary,
thus avoiding the subtle race window.

Signed-off-by: Rafael Aquini <aquini@redhat.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Shaohua Li <shli@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers: modem_if: bring back usb_modem_state for P4LTE
drivers: modem_if: bring back change_modem_state for P4LTE
Bump kernel version to 2.0

Change-Id: Iacfcd609acc0e52eb11da0e663f13471428c3ec1
wireless: bcmdhd: samsung: rename FW file to bcmdhd
defconfig: rename FW file to bcmdhd

Change-Id: Ib18010e229504ecb35b778a05f415018eb47d0ca
Bump kernel version to 2.1

Change-Id: Icb9f208f49c8cea9da113489773c4288df36ef06
Merge branch 'infamous-jb42' of github.com:InfamousAOKP/android_kernel_samsung_p4 into mackay-carbon