more random patches. who knows.

[patches.git] / blackfin-use-defines-not-constants.patch

Index: arch/blackfin/kernel/vmlinux.lds.S
===================================================================
--- arch/blackfin/kernel/vmlinux.lds.S	(revision 3447)
+++ arch/blackfin/kernel/vmlinux.lds.S	(working copy)
@@ -31,6 +31,8 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/mem_map.h>
+#include <asm/page.h>
+#include <asm/thread_info.h>
 
 OUTPUT_FORMAT("elf32-bfin")
 ENTRY(__start)
@@ -64,7 +66,7 @@
 	.data :
 	{
 		__sdata = .;
-		. = ALIGN(0x2000);
+		. = ALIGN(THREAD_SIZE);
 		*(.data.init_task)
 		*(.data)
 		CONSTRUCTORS
@@ -72,14 +74,14 @@
 		. = ALIGN(32);
 		*(.data.cacheline_aligned)
 
-		. = ALIGN(0x2000);
+		. = ALIGN(THREAD_SIZE);
 		__edata = .;
 	}
 
 	___init_begin = .;
 	.init :
 	{
-		. = ALIGN(4096);
+		. = ALIGN(PAGE_SIZE);
 		__sinittext = .;
 		*(.init.text)
 		__einittext = .;
Index: include/asm-blackfin/thread_info.h
===================================================================
--- include/asm-blackfin/thread_info.h	(revision 3447)
+++ include/asm-blackfin/thread_info.h	(working copy)
@@ -39,6 +39,11 @@
  */
 #define ALIGN_PAGE_MASK         0xffffe000
 
+/*
+ * Size of kernel stack for each process. This must be a power of 2...
+ */
+#define THREAD_SIZE		8192	/* 2 pages */
+
 #ifndef __ASSEMBLY__
 
 typedef unsigned long mm_segment_t;
@@ -76,11 +81,6 @@
 #define init_thread_info	(init_thread_union.thread_info)
 #define init_stack		(init_thread_union.stack)
 
-/*
- * Size of kernel stack for each process. This must be a power of 2...
- */
-#define THREAD_SIZE		8192	/* 2 pages */
-
 /* How to get the thread information struct from C */
 
 static inline struct thread_info *current_thread_info(void)
@@ -94,7 +94,7 @@
 	struct thread_info *ti;
       __asm__("%0 = sp;": "=&d"(ti):
 	);
-	return (struct thread_info *)((long)ti & ~8191UL);
+	return (struct thread_info *)((long)ti & ~((long)THREAD_SIZE-1));
 }
 
 /* thread information allocation */