From 49447e228b5835cc0cfea2f393f721b316c70fd7 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 25 Jan 2012 12:09:02 -0800 Subject: ARM: herring: Switch to built-in CFG80211 wlan driver Signed-off-by: Dmitry Shmidt --- arch/arm/configs/herring_defconfig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index 13a1c396f8a..a24382364fd 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -162,6 +162,10 @@ CONFIG_BT_BNEP=y CONFIG_BT_HIDP=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y +CONFIG_CFG80211=y +CONFIG_NL80211_TESTMODE=y +# CONFIG_CFG80211_WEXT is not set +CONFIG_CFG80211_ALLOW_RECONNECT=y CONFIG_WIMAX=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y @@ -193,9 +197,9 @@ CONFIG_DM_UEVENT=y CONFIG_NETDEVICES=y CONFIG_IFB=y CONFIG_TUN=y -CONFIG_BCM4329=m -CONFIG_BCM4329_FW_PATH="/vendor/firmware/fw_bcm4329.bin" -CONFIG_BCM4329_NVRAM_PATH="/vendor/firmware/nvram_net.txt" +CONFIG_BCMDHD=y +CONFIG_BCMDHD_FW_PATH="/vendor/firmware/fw_bcmdhd.bin" +CONFIG_BCMDHD_NVRAM_PATH="/vendor/firmware/nvram_net.txt" CONFIG_WIMAX_CMC7XX=y CONFIG_PPP=y CONFIG_PPP_DEFLATE=y -- cgit v1.2.3 From a31bec6d8f53e02a5ec8e5ae066b57ffb577ae6e Mon Sep 17 00:00:00 2001 From: Simon Wilson Date: Thu, 2 Feb 2012 16:43:05 -0800 Subject: ARM: s5pv210: herring: don't disable prox sensor during suspend A previous change caused the proximity sensor to become disabled during suspend to reduce power consumption , but this needs to remain on if activated. Change-Id: I74920c10b89c4dacd9688dc8db689fb097d64087 Signed-off-by: Simon Wilson --- arch/arm/mach-s5pv210/mach-herring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index be33104846f..29d77ddb73a 100755 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -4904,7 +4904,7 @@ static unsigned int herring_cdma_wimax_sleep_gpio_table[][3] = { { S5PV210_GPJ1(1), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ1(2), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ1(3), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, - { S5PV210_GPJ1(4), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, + { S5PV210_GPJ1(4), S3C_GPIO_SLP_PREV, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ1(5), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ2(0), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN}, -- cgit v1.2.3 From 21b0e08c99180f54138f7ef0a87081ed79a5308b Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Mon, 5 Mar 2012 11:48:19 -0800 Subject: herring_defconfig: enable dynamic debug We need this temporarily to debug watchdog issues around resume. There will be a matching init.rc change to allow non-root user builds to change debugging at runtime. Change-Id: Ib5359e7d2874fe738f19ca1aeec19369917d02d2 Signed-off-by: JP Abgrall --- arch/arm/configs/herring_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index a24382364fd..ca5e8be049c 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -380,6 +380,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_DYNAMIC_DEBUG=y # CONFIG_ARM_UNWIND is not set CONFIG_DEBUG_USER=y CONFIG_DEBUG_S3C_UART=2 -- cgit v1.2.3 From 2cdb45d19ebd62bcd249b4cff49c414fcf1f420c Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 20 Jan 2012 12:10:18 +0100 Subject: ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards commit 612539e81f655f6ac73c7af1da8701c1ee618aee upstream. On v7, we use the same cache maintenance instructions for data lines as for unified lines. This was not the case for v6, where HARVARD_CACHE was defined to indicate the L1 cache topology. This patch removes the erroneous compile-time check for HARVARD_CACHE in proc-v7.S, ensuring that we perform I-side invalidation at boot. Reported-and-Acked-by: Shawn Guo Acked-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- arch/arm/mm/proc-v7.S | 6 ------ 1 file changed, 6 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 089c0b5e454..b6ba1032a98 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -270,10 +270,6 @@ cpu_resume_l1_flags: * Initialise TLB, Caches, and MMU state ready to switch the MMU * on. Return in r0 the new CP15 C1 control register setting. * - * We automatically detect if we have a Harvard cache, and use the - * Harvard cache control instructions insead of the unified cache - * control instructions. - * * This should be able to cover all ARMv7 cores. * * It is assumed that: @@ -363,9 +359,7 @@ __v7_setup: #endif 3: mov r10, #0 -#ifdef HARVARD_CACHE mcr p15, 0, r10, c7, c5, 0 @ I+BTB cache invalidate -#endif dsb #ifdef CONFIG_MMU mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs -- cgit v1.2.3 From 5f3af068b3d0cbdbc5995c740dec4c142024e78b Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Mon, 19 Mar 2012 19:05:44 -0700 Subject: herring_defconfig: enable KSM This is passive until userspace says that pages can be merged. Change-Id: Ie32b2c3df0439f695f7bd4caaf17e9413e450fd8 Signed-off-by: Iliyan Malchev --- arch/arm/configs/herring_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index ca5e8be049c..6cc75c95ac4 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -34,6 +34,7 @@ CONFIG_FIQ_DEBUGGER_CONSOLE=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_COMPACTION=y +CONFIG_KSM=y CONFIG_CMDLINE="console=ttyFIQ0" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y -- cgit v1.2.3 From 4c9f3808f5c9a4cf4e26582c92f2ad3fe4e415b7 Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Tue, 27 Mar 2012 15:04:19 -0700 Subject: herring_defconfig: enable perf events and disable oprofile. Userland profiling tool will switch to perf. Signed-off-by: Ben Cheng Change-Id: I615caae740b98fa3164f830446fde9ca070f4a5d --- arch/arm/configs/herring_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index 6cc75c95ac4..0b6b66ebd76 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -14,9 +14,8 @@ CONFIG_KALLSYMS_ALL=y CONFIG_ASHMEM=y # CONFIG_AIO is not set CONFIG_EMBEDDED=y -# CONFIG_PERF_EVENTS is not set +CONFIG_PERF_COUNTERS=y CONFIG_PROFILING=y -CONFIG_OPROFILE=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y -- cgit v1.2.3 From 90a2fbc6b4c9f6e5c752eeab3fb29c151a8e5b7a Mon Sep 17 00:00:00 2001 From: Kisoo Yu Date: Fri, 10 Feb 2012 18:49:06 +0900 Subject: S5PC11X: PD: Restore clock status in error case of enabling power domain Before enabling power domain, all clocks in that power domain should be on. After enabling, clock status is restored as before. Even though power domain enabling fails, clock should be restored as before. Change-Id: I069ae8883b260b6a0c669747a0fbf63d5401e8c0 Signed-off-by: Kisoo Yu --- arch/arm/mach-s5pv210/power-domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-s5pv210/power-domain.c b/arch/arm/mach-s5pv210/power-domain.c index 59a1a98dd56..683901c64f5 100644 --- a/arch/arm/mach-s5pv210/power-domain.c +++ b/arch/arm/mach-s5pv210/power-domain.c @@ -410,7 +410,7 @@ static int s5pv210_pd_is_enabled(struct regulator_dev *dev) static int s5pv210_pd_enable(struct regulator_dev *dev) { struct s5pv210_pd_data *data = rdev_get_drvdata(dev); - int ret; + int ret = 0; if (data->clk_run) s5pv210_pd_clk_enable(data->clk_run); @@ -418,13 +418,12 @@ static int s5pv210_pd_enable(struct regulator_dev *dev) ret = s5pv210_pd_ctrl(data->ctrlbit, 1); if (ret < 0) { printk(KERN_ERR "failed to enable power domain\n"); - return ret; } if (data->clk_run) s5pv210_pd_clk_disable(data->clk_run); - return 0; + return ret; } static int s5pv210_pd_disable(struct regulator_dev *dev) -- cgit v1.2.3 From 610939f0e7ce51f657598245eba21eb14e189ec0 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 29 Mar 2012 21:47:09 -0700 Subject: USB: gadget: s3c: iscochronous endpoint support Fix problems working with isochronous endpoints Configure the single remaining unallocated endpoint as isochronous IN Signed-off-by: Mike Lockwood --- arch/arm/plat-samsung/include/plat/regs-otg.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/plat-samsung/include/plat/regs-otg.h b/arch/arm/plat-samsung/include/plat/regs-otg.h index 214d7309764..dccdb26905f 100644 --- a/arch/arm/plat-samsung/include/plat/regs-otg.h +++ b/arch/arm/plat-samsung/include/plat/regs-otg.h @@ -208,7 +208,9 @@ #define DEPCTL_EPENA (0x1<<31) #define DEPCTL_EPDIS (0x1<<30) #define DEPCTL_SETD1PID (0x1<<29) +#define DEPCTL_SET_ODD_FRM (0x1<<29) #define DEPCTL_SETD0PID (0x1<<28) +#define DEPCTL_SET_EVEN_FRM (0x1<<28) #define DEPCTL_SNAK (0x1<<27) #define DEPCTL_CNAK (0x1<<26) #define DEPCTL_STALL (0x1<<21) -- cgit v1.2.3 From 3c2b15cacfbe44c74cc3d870b9f3c8bd49cc65e7 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Mon, 2 Apr 2012 19:19:54 -0700 Subject: configs: herring: enable XFRM_USER This is passive, it just installs the hooks to receive netlink commands from user space. It will allow experimenting with IPSec. Change-Id: I754b408a21c7dfefbc09be73d45ea192ebec0e27 Signed-off-by: JP Abgrall --- arch/arm/configs/herring_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index 0b6b66ebd76..e28a18d1c1a 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -51,6 +51,7 @@ CONFIG_APM_EMULATION=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y +CONFIG_XFRM_USER=y CONFIG_NET_KEY=y CONFIG_INET=y CONFIG_IP_MULTICAST=y -- cgit v1.2.3 From ec8d4aa4e1d698c7bb114b13a99eb946448d8e3f Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Wed, 18 Apr 2012 12:22:39 -0700 Subject: arm: defconfig: herring: enable support for the neftilter IDLETIMER. The idletimer is passive until setup via iptables. Change-Id: Ie3227fccd9c30c2902a2d2c81eb659bdaa20489d Signed-off-by: JP Abgrall --- arch/arm/configs/herring_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index e28a18d1c1a..8a57384c6b4 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -88,6 +88,7 @@ CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -- cgit v1.2.3 From 9cea9c804af57f8538dc910e24c407c81e496e51 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Tue, 24 Apr 2012 17:06:45 -0700 Subject: ARM: herring: enable SCHED_TRACER in defconfig Change-Id: Ib45e370f33ac28f9c9883d7370026c2bf3ad5a12 Signed-off-by: JP Abgrall --- arch/arm/configs/herring_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index 8a57384c6b4..ce0f93f4dce 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -377,11 +377,11 @@ CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_SCHED_TRACER=y CONFIG_DYNAMIC_DEBUG=y # CONFIG_ARM_UNWIND is not set CONFIG_DEBUG_USER=y -- cgit v1.2.3 From 6ae285d5333a9c5ebf2a448a73065730b24481f9 Mon Sep 17 00:00:00 2001 From: Ido Yariv Date: Sat, 14 Apr 2012 23:20:30 +0300 Subject: arm: vfp: Fix memory corruption on PM suspend Commit 36af2a47 ("ARM: vfp: Always save VFP state in vfp_pm_suspend") introduced a potential use-after-free bug. On SMP systems, vfp_current_hw_state might hold dangling pointers in case a task which used the VFP last migrates to another CPU and then exits. If vfp_pm_suspend is called while vfp_current_hw_state still holds a pointer to the freed thread_info, that memory location will be written, potentially overwriting a new object allocated there. The original problem is only relevant to UP systems in which the VFP state is stored lazily. Fix this by only storing the VFP state on UP systems, and avoid doing so on SMP ones. Change-Id: I8f7026eb735b340fcef4cf12fbd12b9a0ea08d3f Signed-off-by: Ido Yariv Signed-off-by: Eyal Shapira Signed-off-by: Colin Cross --- arch/arm/vfp/vfpmodule.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 53cb06fc316..f1869138e9f 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -419,9 +419,11 @@ static int vfp_pm_suspend(void) /* disable, just in case */ fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); } else if (vfp_current_hw_state[ti->cpu]) { +#ifndef CONFIG_SMP fmxr(FPEXC, fpexc | FPEXC_EN); vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc); fmxr(FPEXC, fpexc); +#endif } /* clear any information we had about last context state */ -- cgit v1.2.3 From 80b8354d535d2e8d6ced0b0e129257dba1fb2130 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 27 Apr 2012 18:04:18 -0700 Subject: ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend vfp_pm_suspend runs on each cpu, only clear the hardware state pointer for the current cpu. Prevents a possible crash if one cpu clears the hw state pointer when another cpu has already checked if it is valid. Change-Id: I997ab1554944eba86730818ff242d7ebe1b32736 Signed-off-by: Colin Cross --- arch/arm/vfp/vfpmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index f1869138e9f..78829fab70e 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -427,7 +427,7 @@ static int vfp_pm_suspend(void) } /* clear any information we had about last context state */ - memset(vfp_current_hw_state, 0, sizeof(vfp_current_hw_state)); + vfp_current_hw_state[ti->cpu] = NULL; return 0; } -- cgit v1.2.3 From 4501c035d5e654c9243b714f421a19c4bd84e0fe Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Thu, 10 May 2012 12:24:17 +0100 Subject: gpu: pvr: Update to DDK 1.8@904153 - Fix http://b/6446135 "eglHibernateProcessIMG slows down.." Release the bridge mutex in various places while waiting on the hardware. Permits multiple userspace processes/threads entering the driver simulataneously in some controlled cases. - Fix http://b/6096575 "some gralloc operations are very slow" Add a shrinkable pool for uncached memory allocations. Change-Id: I5a2554b351e10b3b35aaccc0ae943a78c1af673c --- arch/arm/configs/herring_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index ce0f93f4dce..6374403c84d 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -265,6 +265,7 @@ CONFIG_PVR_SGX=y CONFIG_PVR_NEED_PVR_DPF=y CONFIG_PVR_NEED_PVR_ASSERT=y CONFIG_PVR_USSE_EDM_STATUS_DEBUG=y +CONFIG_PVR_LINUX_MEM_AREA_POOL=y CONFIG_FB=y CONFIG_FB_S3C=y CONFIG_FB_S3C_NR_BUFFERS=7 -- cgit v1.2.3 From 0bf155a684b9b11fcc5a58be71d1743da1b38965 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Thu, 7 Jun 2012 17:04:00 -0700 Subject: ARM: s5pv210: herring: FIMC1 buffers are not used, so reduce them. jung-min.oh@samsung.com suggested ... """ Some memory can be reduced in crespo. For normal video playback, liboverlay in GB uses the reserved memory of FIMC1 but libhwcomposer in ICS uses the reserved memory of FIMD. """ Change-Id: Id3f40d78795fb96900678fb97ee8e0189daa79d3 Signed-off-by: JP Abgrall --- arch/arm/mach-s5pv210/mach-herring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index 29d77ddb73a..993cb665de1 100755 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -366,7 +366,7 @@ static struct s3cfb_lcd r61408 = { }; #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC0 (6144 * SZ_1K) -#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC1 (9900 * SZ_1K) +#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC1 (4 * SZ_1K) #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC2 (6144 * SZ_1K) #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC0 (36864 * SZ_1K) #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC1 (36864 * SZ_1K) -- cgit v1.2.3 From 8a055ff107b57392864ec8590fc6ef0aafb4bf62 Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Thu, 14 Jun 2012 10:15:06 +0100 Subject: herring_defconfig: Enable SLUB / PAGEALLOC debug. To help us diagnose an issue relating to SGX MMU page table corruption. Change-Id: Idede40ddcb4fe6216513de83be955df1897750fb --- arch/arm/configs/herring_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index 6374403c84d..2e77920a990 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -379,9 +379,11 @@ CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y +CONFIG_SLUB_DEBUG_ON=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_DEBUG_PAGEALLOC=y CONFIG_SCHED_TRACER=y CONFIG_DYNAMIC_DEBUG=y # CONFIG_ARM_UNWIND is not set -- cgit v1.2.3 From 0e96457f9a5ed033769a06c14653994f8e28ed1e Mon Sep 17 00:00:00 2001 From: jp abgrall Date: Thu, 14 Jun 2012 22:32:48 -0700 Subject: Revert "herring_defconfig: Enable SLUB / PAGEALLOC debug." It needs to be undone for experiment 3. This reverts commit 8a055ff107b57392864ec8590fc6ef0aafb4bf62 --- arch/arm/configs/herring_defconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/configs/herring_defconfig b/arch/arm/configs/herring_defconfig index 2e77920a990..6374403c84d 100644 --- a/arch/arm/configs/herring_defconfig +++ b/arch/arm/configs/herring_defconfig @@ -379,11 +379,9 @@ CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y -CONFIG_SLUB_DEBUG_ON=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_DEBUG_PAGEALLOC=y CONFIG_SCHED_TRACER=y CONFIG_DYNAMIC_DEBUG=y # CONFIG_ARM_UNWIND is not set -- cgit v1.2.3