From a1766be2f0e03e04485e542b75e80b5cdc9bed84 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 9 Oct 2009 07:34:00 +0000
Subject: [PATCH] --- yaml --- r: 177260 b: refs/heads/master c:
 bbc51e97d336e0d0461b13bbe4ccdbe768695f5a h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/blackfin/include/asm/bfin-global.h | 4 +---
 trunk/arch/blackfin/include/asm/cacheflush.h  | 1 +
 trunk/arch/blackfin/include/asm/uaccess.h     | 4 +---
 trunk/arch/blackfin/kernel/dma-mapping.c      | 1 +
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 79cab30a18b8..f5f85959a143 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 872d024b40550fcbd3327386e4c891e815d3922a
+refs/heads/master: bbc51e97d336e0d0461b13bbe4ccdbe768695f5a
diff --git a/trunk/arch/blackfin/include/asm/bfin-global.h b/trunk/arch/blackfin/include/asm/bfin-global.h
index 10064f902d20..741c02112c06 100644
--- a/trunk/arch/blackfin/include/asm/bfin-global.h
+++ b/trunk/arch/blackfin/include/asm/bfin-global.h
@@ -11,9 +11,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include <asm/sections.h>
-#include <asm/ptrace.h>
-#include <asm/user.h>
 #include <linux/linkage.h>
 #include <linux/types.h>
 
@@ -35,6 +32,7 @@ extern unsigned long get_sclk(void);
 extern unsigned long sclk_to_usecs(unsigned long sclk);
 extern unsigned long usecs_to_sclk(unsigned long usecs);
 
+struct pt_regs;
 extern void dump_bfin_process(struct pt_regs *regs);
 extern void dump_bfin_mem(struct pt_regs *regs);
 extern void dump_bfin_trace_buffer(void);
diff --git a/trunk/arch/blackfin/include/asm/cacheflush.h b/trunk/arch/blackfin/include/asm/cacheflush.h
index 417eaac7fe99..2666ff8ea952 100644
--- a/trunk/arch/blackfin/include/asm/cacheflush.h
+++ b/trunk/arch/blackfin/include/asm/cacheflush.h
@@ -10,6 +10,7 @@
 #define _BLACKFIN_CACHEFLUSH_H
 
 #include <asm/blackfin.h>	/* for SSYNC() */
+#include <asm/sections.h>	/* for _ramend */
 
 extern void blackfin_icache_flush_range(unsigned long start_address, unsigned long end_address);
 extern void blackfin_dcache_flush_range(unsigned long start_address, unsigned long end_address);
diff --git a/trunk/arch/blackfin/include/asm/uaccess.h b/trunk/arch/blackfin/include/asm/uaccess.h
index c03b8532aad3..1c0d190adaef 100644
--- a/trunk/arch/blackfin/include/asm/uaccess.h
+++ b/trunk/arch/blackfin/include/asm/uaccess.h
@@ -17,9 +17,7 @@
 #include <linux/string.h>
 
 #include <asm/segment.h>
-#ifdef CONFIG_ACCESS_CHECK
-# include <asm/bfin-global.h>
-#endif
+#include <asm/sections.h>
 
 #define get_ds()        (KERNEL_DS)
 #define get_fs()        (current_thread_info()->addr_limit)
diff --git a/trunk/arch/blackfin/kernel/dma-mapping.c b/trunk/arch/blackfin/kernel/dma-mapping.c
index be81572b89c2..755a0f4b61ae 100644
--- a/trunk/arch/blackfin/kernel/dma-mapping.c
+++ b/trunk/arch/blackfin/kernel/dma-mapping.c
@@ -17,6 +17,7 @@
 #include <linux/scatterlist.h>
 #include <asm/cacheflush.h>
 #include <asm/bfin-global.h>
+#include <asm/sections.h>
 
 static spinlock_t dma_page_lock;
 static unsigned long *dma_page;