Merge tag 'lsk-v3.10-15.05-android' into develop-3.10

diff --cc Makefile
Simple merge

diff --cc arch/arm/include/asm/elf.h
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kernel/psci.c
index d356b8d4531c9a00e378a258e2a5e12f34d57979,fc457d0fee9c84540891e1e771242c86a0718a0e..bfcf55da61b3b4acd67e69627dcb614fd4eeddf7
--- 1/arch/arm64/kernel/psci.c
--- 2/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@@ -102,49 -104,14 +105,15 @@@ static u32 psci_power_state_pack(struc
  static void psci_power_state_unpack(u32 power_state,
                                    struct psci_power_state *state)
  {
 -      state->id = (power_state >> PSCI_0_2_POWER_STATE_ID_SHIFT)
 -                      & PSCI_0_2_POWER_STATE_ID_MASK;
 -      state->type = (power_state >> PSCI_0_2_POWER_STATE_TYPE_SHIFT)
 -                      & PSCI_0_2_POWER_STATE_TYPE_MASK;
 -      state->affinity_level = (power_state >> PSCI_0_2_POWER_STATE_AFFL_SHIFT)
 -                      & PSCI_0_2_POWER_STATE_AFFL_MASK;
 +      state->id = (power_state & PSCI_0_2_POWER_STATE_ID_MASK) >>
 +                      PSCI_0_2_POWER_STATE_ID_SHIFT;
 +      state->type = (power_state & PSCI_0_2_POWER_STATE_TYPE_MASK) >>
 +                      PSCI_0_2_POWER_STATE_TYPE_SHIFT;
 +      state->affinity_level =
 +                      (power_state & PSCI_0_2_POWER_STATE_AFFL_MASK) >>
 +                      PSCI_0_2_POWER_STATE_AFFL_SHIFT;
  }
  
- /*
-  * The following two functions are invoked via the invoke_psci_fn pointer
-  * and will not be inlined, allowing us to piggyback on the AAPCS.
-  */
- static noinline int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1,
-                                        u64 arg2)
- {
-       asm volatile(
-                       __asmeq("%0", "x0")
-                       __asmeq("%1", "x1")
-                       __asmeq("%2", "x2")
-                       __asmeq("%3", "x3")
-                       "hvc    #0\n"
-               : "+r" (function_id)
-               : "r" (arg0), "r" (arg1), "r" (arg2));
- 
-       return function_id;
- }
- 
- static noinline int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1,
-                                        u64 arg2)
- {
-       asm volatile(
-                       __asmeq("%0", "x0")
-                       __asmeq("%1", "x1")
-                       __asmeq("%2", "x2")
-                       __asmeq("%3", "x3")
-                       "smc    #0\n"
-               : "+r" (function_id)
-               : "r" (arg0), "r" (arg1), "r" (arg2));
- 
-       return function_id;
- }
- 
  static int psci_get_version(void)
  {
        int err;

diff --cc drivers/cpufreq/cpufreq_interactive.c
index 3b4d68546f5650fd9c1002dcdca1483985e374c9,cb477d6a21d6260f6101a34d15a33211175635b8..23faa5e3671348dfafd1fdba8b875c3b6c31865e
--- 1/drivers/cpufreq/cpufreq_interactive.c
--- 2/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@@ -375,22 -364,10 +375,22 @@@ static void cpufreq_interactive_timer(u
        spin_lock_irqsave(&pcpu->target_freq_lock, flags);
        do_div(cputime_speedadj, delta_time);
        loadadjfreq = (unsigned int)cputime_speedadj * 100;
-       cpu_load = loadadjfreq / pcpu->target_freq;
+       cpu_load = loadadjfreq / pcpu->policy->cur;
        tunables->boosted = tunables->boost_val || now < tunables->boostpulse_endtime;
  
 +#ifdef CONFIG_ARCH_ROCKCHIP
 +      pcpu->target_freq = pcpu->policy->cur;
 +      tunables->boosted |= now < tunables->touchboostpulse_endtime;
 +#endif
 +
        if (cpu_load >= tunables->go_hispeed_load || tunables->boosted) {
 +#ifdef CONFIG_ARCH_ROCKCHIP
 +              if (now < tunables->touchboostpulse_endtime) {
 +                      new_freq = choose_freq(pcpu, loadadjfreq);
 +                      if (new_freq < tunables->touchboost_freq)
 +                              new_freq = tunables->touchboost_freq;
 +              } else
 +#endif
                if (pcpu->target_freq < tunables->hispeed_freq) {
                        new_freq = tunables->hispeed_freq;
                } else {

diff --cc drivers/i2c/i2c-core.c
index c1f8ccd40b15dbf283772c062f58f3bf9c4bf5b0,c12299fd8cca33901eea01b0b0a5786f5f500a01..e3a4f744a791a87cf24055b93131e8a1933b26f1
mode 100755,100644..100755
--- 1/drivers/i2c/i2c-core.c
--- 2/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c

diff --cc drivers/mmc/card/block.c
index 6df820652d6d85096a9cf44da5272dae3953d582,d813cb9a366676a22202934fac775f7bd6368ffb..355c18f4aa39ddb480a0be90b0791177ad083bd2
mode 100755,100644..100755
--- 1/drivers/mmc/card/block.c
--- 2/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c

diff --cc drivers/mmc/card/queue.c
Simple merge

diff --cc drivers/pinctrl/core.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/staging/android/fiq_debugger/fiq_debugger.c
index b02cfe89eb0c9fca4e760a41e97e53085342c724,1d733624d70a2ad078b6592339a67bac9a91fb17..d2b069f0b4c60f3f5ff7456610db20a244c083e3
mode 100755,100644..100755
--- 1/drivers/staging/android/fiq_debugger/fiq_debugger.c
--- 2/drivers/staging/android/fiq_debugger/fiq_debugger.c
+++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c

diff --cc drivers/usb/core/hub.c
index 2260781b50af26e5be83c84b7f6f72aa415a939f,11a073cda1d622518c4b0069422d3c69a5d99d93..da1fe23c1f0aa706fd2b46583472b0aa7d375c92
mode 100755,100644..100755
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c

diff --cc drivers/usb/gadget/Kconfig
index 0ef3cdf97e6a10239c64e43e51cf4eb5bed51ee3,9de2eb28085e3cac6ab385777625ef5e0cd0c4ac..7b899e1db5f7c443760ef9f21dfcf1d485025043
mode 100755,100644..100755
--- 1/drivers/usb/gadget/Kconfig
--- 2/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge