Blackfin: override text/data checking functions

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Robin Getz <rgetz@blackfin.uclinux.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/blackfin/include/asm/sections.h b/arch/blackfin/include/asm/sections.h
index e7fd0ecd73f75de4d2a7df13b85a5049e046b7aa..ae4dae1e370b150a3df989bd2fd403a6e8e5ba24 100644 (file)
--- a/arch/blackfin/include/asm/sections.h
+++ b/arch/blackfin/include/asm/sections.h
@@ -1,9 +1,6 @@
 #ifndef _BLACKFIN_SECTIONS_H
 #define _BLACKFIN_SECTIONS_H
 
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
 /* only used when MTD_UCLINUX */
 extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size;
 
@@ -15,4 +12,39 @@ extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[],
        _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[], _sbss_l2[],
        _ebss_l2[], _l2_lma_start[];
 
+#include <asm/mem_map.h>
+
+/* Blackfin systems have discontinuous memory map and no virtualized memory */
+static inline int arch_is_kernel_text(unsigned long addr)
+{
+       return
+               (L1_CODE_LENGTH &&
+                addr >= (unsigned long)_stext_l1 &&
+                addr <  (unsigned long)_etext_l1)
+               ||
+               (L2_LENGTH &&
+                addr >= (unsigned long)_stext_l2 &&
+                addr <  (unsigned long)_etext_l2);
+}
+#define arch_is_kernel_text(addr) arch_is_kernel_text(addr)
+
+static inline int arch_is_kernel_data(unsigned long addr)
+{
+       return
+               (L1_DATA_A_LENGTH &&
+                addr >= (unsigned long)_sdata_l1 &&
+                addr <  (unsigned long)_ebss_l1)
+               ||
+               (L1_DATA_B_LENGTH &&
+                addr >= (unsigned long)_sdata_b_l1 &&
+                addr <  (unsigned long)_ebss_b_l1)
+               ||
+               (L2_LENGTH &&
+                addr >= (unsigned long)_sdata_l2 &&
+                addr <  (unsigned long)_ebss_l2);
+}
+#define arch_is_kernel_data(addr) arch_is_kernel_data(addr)
+
+#include <asm-generic/sections.h>
+
 #endif