--- a/arch/arm/mach-msm/cache_erp.c
+++ b/arch/arm/mach-msm/cache_erp.c
@@ -24,9 +24,9 @@
#include "acpuclock.h"
#include <linux/ratelimit.h>
-#ifdef CONFIG_SEC_L1_DCACHE_PANIC_CHK
-#include <mach/sec_debug.h>
-#endif
+//#ifdef CONFIG_SEC_L1_DCACHE_PANIC_CHK
+//#include <mach/sec_debug.h>
+//#endif
#define CESR_DCTPE BIT(0)
#define CESR_DCDPE BIT(1)
@@ -344,13 +344,13 @@ static irqreturn_t msm_l1_erp_irq(int ir
/* Clear the interrupt bits we processed */
write_cesr(cesr);
-#ifdef CONFIG_SEC_L1_DCACHE_PANIC_CHK
- if (print_regs)
- sec_l1_dcache_check_fail();
-#else
+//#ifdef CONFIG_SEC_L1_DCACHE_PANIC_CHK
+// if (print_regs)
+// sec_l1_dcache_check_fail();
+//#else
if (print_regs)
ERP_L1_ERR("L1 cache error detected");
-#endif
+//#endif
return IRQ_HANDLED;
}
--- a/drivers/misc/sec_misc.c
+++ b/drivers/misc/sec_misc.c
@@ -32,7 +32,7 @@
#include <linux/blkdev.h>
#include <mach/gpio.h>
#include <linux/sec_param.h>
-#include <mach/sec_debug.h>
+//#include <mach/sec_debug.h>
#define MOVINAND_CHECKSUM
#define RORY_CONTROL
@@ -133,6 +133,7 @@ static DEVICE_ATTR(rory_control, S_IRUGO
rory_control_show, rory_control_store);
#endif /*RORY_CONTROL*/
+/*#ifdef CONFIG_SEC_DEBUG
static unsigned int convert_debug_level_str(const char *str)
{
if (strncasecmp(str, "0xA0A0", 6) == 0)
@@ -191,6 +192,7 @@ static ssize_t debug_level_store(struct
static DEVICE_ATTR(debug_level, S_IRUGO | S_IWUSR ,
debug_level_show, debug_level_store);
+#endif*/
#if defined(CONFIG_MACH_APEXQ) || defined(CONFIG_MACH_AEGIS2)
static ssize_t slideCount_show
@@ -225,7 +227,9 @@ static struct device_attribute *sec_misc
&dev_attr_emmc_checksum_done,
&dev_attr_emmc_checksum_pass,
&dev_attr_rory_control,
+/*#ifdef CONFIG_SEC_DEBUG
&dev_attr_debug_level,
+#endif*/
#if defined(CONFIG_MACH_APEXQ) || defined(CONFIG_MACH_AEGIS2)
&dev_attr_slideCount,
#endif
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1473,7 +1473,7 @@ void task_dirty_inc(struct task_struct *
/* readahead.c */
#define VM_MAX_READAHEAD 2048 /* kbytes */
-#define VM_MIN_READAHEAD 64 /* kbytes (includes current page) */
+#define VM_MIN_READAHEAD 128 /* kbytes (includes current page) */
extern unsigned long max_readahead_pages;
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -109,14 +109,14 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us
obj-$(CONFIG_PADATA) += padata.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
-ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
+# ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
# needed for x86 only. Why this used to be enabled for all architectures is beyond
# me. I suspect most platforms don't need this, but until we know that for sure
# I turn this off for IA-64 only. Andreas Schwab says it's also needed on m68k
# to get a correct value for the wait-channel (WCHAN in ps). --davidm
-CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
-endif
+# CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
+# endif
$(obj)/configs.o: $(obj)/config_data.h
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -81,7 +81,7 @@ NORET_TYPE void panic(const char * fmt,
* Disable the Trace AS SOON AS POSSIBLE So we can preserve the
* Faulty Instructions for Analysis
*/
- __etb_disable();
+ //__etb_disable();
/*
* It's possible to come here directly from a panic-assertion and
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1633,6 +1633,8 @@ static int select_idle_sibling(struct ta
struct sched_domain *sd;
int i;
+ goto done;
+
/*
* If the task is going to be woken-up on this cpu and if it is
* already idle, then it is the right target.
@@ -1671,7 +1673,7 @@ static int select_idle_sibling(struct ta
break;
}
rcu_read_unlock();
-
+done:
return target;
}
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1870,7 +1870,7 @@ __acquires(&gcwq->lock)
lock_map_acquire_read(&cwq->wq->lockdep_map);
lock_map_acquire(&lockdep_map);
trace_workqueue_execute_start(work);
- secdbg_sched_msg("@%pS", f);
+ //secdbg_sched_msg("@%pS", f);
f(work);
/*
* While we must be careful to not use "work" after this, the trace
projects / ziggy471-sgs3-jb.git / commitdiff