ARM: SMP: use a timing out completion for cpu hotplug

    ARM: SMP: use a timing out completion for cpu hotplug

    Rather than open-coding the jiffy-based wait, and polling for the
    secondary CPU to come online, use a completion instead.  This
    removes the need to poll, instead we will be notified when the
    secondary CPU has initialized.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: 7060/1: smp: populate logical CPU mapping during boot

To allow booting Linux on a CPU with physical ID != 0, we need to
provide a mapping from the logical CPU number to the physical CPU
number.

This patch adds such a mapping and populates it during boot.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: 7124/1: smp: Add a localtimer handler callable from C code

In order to be able to handle localtimer directly from C code instead of
assembly code, introduce handle_local_timer(), which is modeled after
handle_IRQ().

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: smp: fix clipping of number of CPUs

Rather than clipping the number of CPUs using the compile-time NR_CPUS
constant, use the runtime nr_cpu_ids value instead.  This allows the
nr_cpus command line option to work as expected.

Cc: <stable@kernel.org>
Reported-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Conflicts:
	arch/arm/mach-msm/platsmp.c
Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slab: fix DEBUG_SLAB warning
  slab: shrink sizeof(struct kmem_cache)
  slab: fix DEBUG_SLAB build
  SLUB: Fix missing <linux/stacktrace.h> include
  slub: reduce overhead of slub_debug
  slub: Add method to verify memory is not freed
  slub: Enable backtrace for create/delete points
  slab allocators: Provide generic description of alignment defines
  slab, slub, slob: Unify alignment definition
  slob/lockdep: Fix gfp flags passed to lockdep
(cherry picked from commit f99b7880cb9863e11441bd8b2f31d4f556ef1a44)

Conflicts:

	mm/slob.c

Conflicts:
	mm/slob.c
Add some ies parsing debugging
net: wireless: bcmdhd: Update to version 1.28.13-1

- Fix sending unproper value for connection status to CFG80211 layer
- Fix wl_scan_prep which can leave a hole in channel list if channel
  is a DFS channel and it is virtual interface scan
- SoftAP: Fix setting DTIM interval
- Fix len variable to be signed in dhdsdio_download_code_file
- Add ARP white packet filter list during P2P mode
- Add extra check if glom is NOT default to update bus:txglom

Change-Id: Ib1fd9f77eef2fb8333fb80e749fda5b7186aa83c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: cfg80211 fixes

- Add wl_cfg80211_40MHz_to_20MHz_Channel() processing
- Add mac address information of the ap for debugging
  disconnection or roaming problem in wl_notify_connect_status
- Fix hidden AP connection failure from cfg80211 WARNING
  in static s32 wl_update_bss_info()

Change-Id: Ibafc2b766d0515c21abbba3bdfab68ff4acbebad
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
staging: android: lowmemorykiller: Add config option to support oom_adj values

The conversion to use oom_score_adj instead of the deprecated oom_adj
values breaks existing user-space code. Add a config option to convert
oom_adj values written to oom_score_adj values if they appear to be
valid oom_adj values.

Change-Id: I68308125059b802ee2991feefb07e9703bc48549
Signed-off-by: Arve Hjønnevåg <arve@android.com>

Conflicts:
	drivers/staging/android/Kconfig
cyanogenmod_ak_defconfig: Enable AUTODETECT_OOM_ADJ_VALUES
lowmemorykiller.c: Fix compile error
cpufreq: separate Interactive governor into two, one with static settings and another one with dynamic settings (it adjusts itself according to load). The new governor is called Dynamic Interactive.

Conflicts:
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_interactive.c
cpufreq: interactive: change frequency up/down kernel thread priority. Now it has more priority than any user thread which should boost interactivity.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
cpufreq: interactive: add input_boost_freq entry. This entry is the frequency which the CPU will be boosted when the screen is touched. It's user configurable from userspace and it needs to match the entries in the frequency table.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
opp4xxx_data.c: Rework all Frequency to High Values
cpufreq_interactive.c: Fix hispeed
cyanogenmod_ak_defconfig: Enable CPU_FREQ_GOV_DYNAMIC_INTERACTIVE
Revert "ARM: SMP: use a timing out completion for cpu hotplug"

This reverts commit 93d5ec6e8c88ec13a190aa092f325a8c87651276.
Revert "ARM: 7060/1: smp: populate logical CPU mapping during boot"

This reverts commit 30c77c4c57a7ba1e3ebfffc4ce4ba6f9e45997bc.
Revert "ARM: 7124/1: smp: Add a localtimer handler callable from C code"

This reverts commit 359e1bc237ae6d29be4d5e646fefc2e94663c2e7.