Title: [9207] trunk/arch/blackfin: blackin: revert svn rev 8953
Revision
9207
Author
vapier
Date
2010-10-15 22:18:02 -0400 (Fri, 15 Oct 2010)

Log Message

blackin: revert svn rev 8953

binding L1 stack code to an unrelated Kconfig option (EXCEPTION_L1_SCRATCH) is not the way to go

Modified Paths

Diff

Modified: trunk/arch/blackfin/Kconfig (9206 => 9207)


--- trunk/arch/blackfin/Kconfig	2010-10-16 01:45:28 UTC (rev 9206)
+++ trunk/arch/blackfin/Kconfig	2010-10-16 02:18:02 UTC (rev 9207)
@@ -865,9 +865,19 @@
 	  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/include/asm/mmu_context.h (9206 => 9207)


--- trunk/arch/blackfin/include/asm/mmu_context.h	2010-10-16 01:45:28 UTC (rev 9206)
+++ trunk/arch/blackfin/include/asm/mmu_context.h	2010-10-16 02:18:02 UTC (rev 9207)
@@ -85,7 +85,7 @@
 	}
 #endif
 
-#ifndef CONFIG_EXCEPTION_L1_SCRATCH
+#ifdef CONFIG_APP_STACK_L1
 	/* L1 stack switching.  */
 	if (!next_mm->context.l1_stack_save)
 		return;
@@ -188,7 +188,7 @@
 	unsigned int cpu = smp_processor_id();
 #endif
 
-#ifndef CONFIG_EXCEPTION_L1_SCRATCH
+#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)

Modified: trunk/arch/blackfin/kernel/ptrace.c (9206 => 9207)


--- trunk/arch/blackfin/kernel/ptrace.c	2010-10-16 01:45:28 UTC (rev 9206)
+++ trunk/arch/blackfin/kernel/ptrace.c	2010-10-16 02:18:02 UTC (rev 9207)
@@ -136,7 +136,7 @@
 	if (start >= FIXED_CODE_START && start + len < FIXED_CODE_END)
 		return 0;
 
-#ifndef CONFIG_EXCEPTION_L1_SCRATCH
+#ifdef CONFIG_APP_STACK_L1
 	if (child->mm->context.l1_stack_save)
 		if (start >= (unsigned long)l1_stack_base &&
 			start + len < (unsigned long)l1_stack_base + l1_stack_len)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to