Log Message
As Mike pointed out, change CONFIG_KERNEL_STACKS_L1 to CONFIG_APP_STACK_L1
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (5252 => 5253)
--- trunk/arch/blackfin/Kconfig 2008-09-08 06:15:13 UTC (rev 5252)
+++ trunk/arch/blackfin/Kconfig 2008-09-08 07:50:53 UTC (rev 5253)
@@ -622,12 +622,11 @@
If enabled, the CPLB Switch Tables are linked
into L1 data memory. (less latency)
-config KERNEL_STACKS_L1
- bool "Locate kernel stacks in L1 Scratch Memory"
+config APP_STACK_L1
+ bool "Support locating application stack in L1 Scratch Memory"
default y
- depends on !BF531
help
- If enabled the kernel stacks are located
+ If enabled the application stack can be located
into L1 scratch memory (less latency).
comment "Speed Optimizations"
Modified: trunk/fs/binfmt_flat.c (5252 => 5253)
--- trunk/fs/binfmt_flat.c 2008-09-08 06:15:13 UTC (rev 5252)
+++ trunk/fs/binfmt_flat.c 2008-09-08 07:50:53 UTC (rev 5253)
@@ -417,9 +417,6 @@
unsigned long *extra_stack,
unsigned long *stack_base)
{
-#ifndef CONFIG_KERNEL_STACKS_L1
- static int l1stk_disable_warn_once;
-#endif
struct flat_hdr * hdr;
unsigned long textpos = 0, datapos = 0, result;
unsigned long realdatastart = 0;
@@ -505,12 +502,9 @@
return -ENOMEM;
if (flags & FLAT_FLAG_L1STK) {
-#ifndef CONFIG_KERNEL_STACKS_L1
+#ifndef CONFIG_APP_STACK_L1
flags &= ~FLAT_FLAG_L1STK;
- if (!l1stk_disable_warn_once) {
- l1stk_disable_warn_once = 1;
- printk(KERN_NOTICE "BINFMT_FLAT: L1 stack support disabled - will continue anyway\n");
- }
+ printk(KERN_NOTICE "BINFMT_FLAT: L1 stack support disabled - will continue anyway\n");
#else
if (stack_base == 0) {
printk ("BINFMT_FLAT: requesting L1 stack for shared library\n");
@@ -809,7 +803,7 @@
return 0;
out_fail:
-#ifdef CONFIG_KERNEL_STACKS_L1
+#ifdef CONFIG_APP_STACK_L1
if (flags & FLAT_FLAG_L1STK)
free_l1stack();
#endif
@@ -933,7 +927,7 @@
/* Stash our initial stack pointer into the mm structure */
current->mm->start_stack = (unsigned long )sp;
-#ifdef CONFIG_KERNEL_STACKS_L1
+#ifdef CONFIG_APP_STACK_L1
if (l1stack_base) {
/* Find L1 stack pointer corresponding to the current bottom
of the stack in normal RAM. */
Modified: trunk/include/asm-blackfin/mmu_context.h (5252 => 5253)
--- trunk/include/asm-blackfin/mmu_context.h 2008-09-08 06:15:13 UTC (rev 5252)
+++ trunk/include/asm-blackfin/mmu_context.h 2008-09-08 07:50:53 UTC (rev 5253)
@@ -37,7 +37,7 @@
#include <asm/pgalloc.h>
#include <asm/cplbinit.h>
-#ifdef CONFIG_KERNEL_STACKS_L1
+#ifdef CONFIG_APP_STACK_L1
extern void *current_l1_stack_save;
extern int nr_l1stack_tasks;
@@ -82,7 +82,7 @@
memcpy(l1_stack_base, current_l1_stack_save, l1_stack_len);
return 1;
}
-#endif /* CONFIG_KERNEL_STACKS_L1 */
+#endif /* CONFIG_APP_STACK_L1 */
#define deactivate_mm(tsk,mm) do { } while (0)
@@ -100,7 +100,7 @@
}
#endif
-#ifdef CONFIG_KERNEL_STACKS_L1
+#ifdef CONFIG_APP_STACK_L1
/* L1 stack switching. */
if (!next_mm->context.l1_stack_save)
return;
@@ -169,7 +169,7 @@
{
struct sram_list_struct *tmp;
-#ifdef CONFIG_KERNEL_STACKS_L1
+#ifdef CONFIG_APP_STACK_L1
if (current_l1_stack_save == mm->context.l1_stack_save)
current_l1_stack_save = 0;
if (mm->context.l1_stack_save)
_______________________________________________ Linux-kernel-commits mailing list [email protected] http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
