invisiblek

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 8cee79c..5da13d7 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1729,7 +1729,8 @@ out:
  */
 int wake_up_process(struct task_struct *p)
 {
-	return try_to_wake_up(p, TASK_ALL, 0);
+	WARN_ON(task_is_stopped_or_traced(p));

invisiblek

92967 # cm: build: Implement shared library caching
92962 # imgdiff: skip over rest of kernel image after first match for gzip header
92963 # ConnectivityService: add persist.ro.radio.noril

# telephony
93016 # Start populating sub_id again
93245 # Revert Telephony: DcTracker: Fix CDMA APN Data issues
93017 # Add proper DB upgrade path

# otg

invisiblek

diff --git a/drivers/nfc/pn544-oppo_find7op.c b/../../oppo/n3/drivers/nfc/pn544_op.c
old mode 100644
new mode 100755
index 13d265d..d6a5f59
--- a/drivers/nfc/pn544-oppo_find7op.c
+++ b/../../oppo/n3/drivers/nfc/pn544_op.c
@@ -77,55 +77,10 @@ struct pn544_dev
 };
 
 /*OPPO yuyi 2013-10-24 add begin for nfc_devinfo*/

invisiblek

/*
 *  arch/arm/include/asm/unistd.h
 *
 *  Copyright (C) 2001-2005 Russell King
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 * Please forward _all_ changes to this file to [email protected],

invisiblek

#!/bin/bash

cmversion=12.1
outdir=/opt/out/${cmversion}
ccachedir=/home/dp/cm/${cmversion}/prebuilts/misc/linux-x86/ccache
jobs=12

if [ "`which arm-eabi-gcc`" == "" ]; then
  echo "No toolchain in path!"
  echo "Make sure an arm-eabi-gcc is in your path!"

invisiblek

#!/bin/bash

# Set some personalized parameters
destemail="[email protected]"
sourcedir=$HOME/cm
tempdir=$sourcedir/tempdir
export USE_CCACHE=1
export USE_PREBUILT_CACHE=1
export CCACHE_DIR=/opt/ccache
export OUT_DIR_COMMON_BASE=/opt/out

invisiblek

#!/bin/bash

first=true
version="12.1"

personal_devices=(vs985 n3 m8 dlx jfltevzw) # i605 flo
public_devices=(v410 tenderloin d2vzw)

for i in ${personal_devices[@]}; do
  logfilename=$i-`date +%Y%m%d`.log

invisiblek

diff --git a/src/java/com/android/internal/telephony/UiccSmsController.java b/src/java/com/android/internal/telephony/UiccSmsController.java
old mode 100755
new mode 100644
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 83af92a..05b3557 100755
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -904,7 +904,6 @@ public final class DcTracker extends DcTrackerBase {
     }
 

invisiblek

#Uncommenting these urls would only enable
#the power up auto injection and force injection(test case).
XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin

# Error Estimate
# _SET = 1
# _CLEAR = 0
ERR_ESTIMATE=0

invisiblek

HEAD detached from 9b1ac40
You are currently cherry-picking commit d4159d4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Documentation/cgroups/cpusets.txt
	modified:   Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
	modified:   Documentation/devicetree/bindings/tty/serial/of-serial.txt