Diff
Modified: trunk/arch/blackfin/Kconfig (8952 => 8953)
--- trunk/arch/blackfin/Kconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/Kconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -867,19 +867,9 @@
If you are using a processor affected by an anomaly, the build
system will double check for you and prevent it.
-config APP_STACK_L1
- bool "Support locating application stack in L1 Scratch Memory"
- default y
- help
- If enabled the application stack can be located in L1
- scratch memory (less latency).
-
- Currently only works with FLAT binaries.
-
config EXCEPTION_L1_SCRATCH
bool "Locate exception stack in L1 Scratch Memory"
default n
- depends on !APP_STACK_L1
help
Whenever an exception occurs, use the L1 Scratch memory for
stack storage. You cannot place the stacks of FLAT binaries
Modified: trunk/arch/blackfin/configs/BF518F-EZBRD_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF518F-EZBRD_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF518F-EZBRD_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -370,7 +370,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF526-EZBRD_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF526-EZBRD_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF526-EZBRD_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -376,7 +376,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -377,7 +377,6 @@
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF527-EZKIT-V2_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF527-EZKIT-V2_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF527-EZKIT-V2_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -376,7 +376,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF527-EZKIT_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF527-EZKIT_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF527-EZKIT_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -376,7 +376,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF533-EZKIT_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF533-EZKIT_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF533-EZKIT_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -335,7 +335,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF533-STAMP_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF533-STAMP_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF533-STAMP_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -336,7 +336,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF537-STAMP_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF537-STAMP_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF537-STAMP_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -344,7 +344,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF538-EZKIT_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF538-EZKIT_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF538-EZKIT_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -354,7 +354,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF548-EZKIT_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF548-EZKIT_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF548-EZKIT_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -411,7 +411,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF561-ACVILON_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF561-ACVILON_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF561-ACVILON_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -330,7 +330,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/BF561-EZKIT_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/BF561-EZKIT_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/BF561-EZKIT_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -374,7 +374,6 @@
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/CM-BF527_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/CM-BF527_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/CM-BF527_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -319,7 +319,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/CM-BF533_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/CM-BF533_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/CM-BF533_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -279,7 +279,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/CM-BF537E_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/CM-BF537E_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/CM-BF537E_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -288,7 +288,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/CM-BF537U_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/CM-BF537U_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/CM-BF537U_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -288,7 +288,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/CM-BF548_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/CM-BF548_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/CM-BF548_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -346,7 +346,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/CM-BF561_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/CM-BF561_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/CM-BF561_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -318,7 +318,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/PNAV-10_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/PNAV-10_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/PNAV-10_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -336,7 +336,6 @@
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
CONFIG_CACHE_FLUSH_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/TCM-BF518_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/TCM-BF518_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/TCM-BF518_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -333,7 +333,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
# CONFIG_SYSCALL_TAB_L1 is not set
# CONFIG_CPLB_SWITCH_TAB_L1 is not set
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/configs/TCM-BF537_defconfig (8952 => 8953)
--- trunk/arch/blackfin/configs/TCM-BF537_defconfig 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/configs/TCM-BF537_defconfig 2010-06-29 09:39:11 UTC (rev 8953)
@@ -287,7 +287,6 @@
CONFIG_CACHELINE_ALIGNED_L1=y
CONFIG_SYSCALL_TAB_L1=y
CONFIG_CPLB_SWITCH_TAB_L1=y
-CONFIG_APP_STACK_L1=y
#
# Speed Optimizations
Modified: trunk/arch/blackfin/include/asm/mmu_context.h (8952 => 8953)
--- trunk/arch/blackfin/include/asm/mmu_context.h 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/include/asm/mmu_context.h 2010-06-29 09:39:11 UTC (rev 8953)
@@ -85,7 +85,7 @@
}
#endif
-#ifdef CONFIG_APP_STACK_L1
+#ifndef CONFIG_EXCEPTION_L1_SCRATCH
/* L1 stack switching. */
if (!next_mm->context.l1_stack_save)
return;
@@ -188,7 +188,7 @@
unsigned int cpu = smp_processor_id();
#endif
-#ifdef CONFIG_APP_STACK_L1
+#ifndef CONFIG_EXCEPTION_L1_SCRATCH
if (current_l1_stack_save == mm->context.l1_stack_save)
current_l1_stack_save = 0;
if (mm->context.l1_stack_save)
Modified: trunk/arch/blackfin/kernel/ptrace.c (8952 => 8953)
--- trunk/arch/blackfin/kernel/ptrace.c 2010-06-29 08:55:29 UTC (rev 8952)
+++ trunk/arch/blackfin/kernel/ptrace.c 2010-06-29 09:39:11 UTC (rev 8953)
@@ -136,7 +136,7 @@
if (start >= FIXED_CODE_START && start + len < FIXED_CODE_END)
return 0;
-#ifdef CONFIG_APP_STACK_L1
+#ifndef CONFIG_EXCEPTION_L1_SCRATCH
if (child->mm->context.l1_stack_save)
if (start >= (unsigned long)l1_stack_base &&
start + len < (unsigned long)l1_stack_base + l1_stack_len)
