diff options
-rw-r--r-- | arch/blackfin/include/asm/bfin-global.h | 4 | ||||
-rw-r--r-- | arch/blackfin/include/asm/cacheflush.h | 1 | ||||
-rw-r--r-- | arch/blackfin/include/asm/uaccess.h | 4 | ||||
-rw-r--r-- | arch/blackfin/kernel/dma-mapping.c | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index 10064f902d20..741c02112c06 100644 --- a/arch/blackfin/include/asm/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h | |||
@@ -11,9 +11,6 @@ | |||
11 | 11 | ||
12 | #ifndef __ASSEMBLY__ | 12 | #ifndef __ASSEMBLY__ |
13 | 13 | ||
14 | #include <asm/sections.h> | ||
15 | #include <asm/ptrace.h> | ||
16 | #include <asm/user.h> | ||
17 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
18 | #include <linux/types.h> | 15 | #include <linux/types.h> |
19 | 16 | ||
@@ -35,6 +32,7 @@ extern unsigned long get_sclk(void); | |||
35 | extern unsigned long sclk_to_usecs(unsigned long sclk); | 32 | extern unsigned long sclk_to_usecs(unsigned long sclk); |
36 | extern unsigned long usecs_to_sclk(unsigned long usecs); | 33 | extern unsigned long usecs_to_sclk(unsigned long usecs); |
37 | 34 | ||
35 | struct pt_regs; | ||
38 | extern void dump_bfin_process(struct pt_regs *regs); | 36 | extern void dump_bfin_process(struct pt_regs *regs); |
39 | extern void dump_bfin_mem(struct pt_regs *regs); | 37 | extern void dump_bfin_mem(struct pt_regs *regs); |
40 | extern void dump_bfin_trace_buffer(void); | 38 | extern void dump_bfin_trace_buffer(void); |
diff --git a/arch/blackfin/include/asm/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h index 417eaac7fe99..2666ff8ea952 100644 --- a/arch/blackfin/include/asm/cacheflush.h +++ b/arch/blackfin/include/asm/cacheflush.h | |||
@@ -10,6 +10,7 @@ | |||
10 | #define _BLACKFIN_CACHEFLUSH_H | 10 | #define _BLACKFIN_CACHEFLUSH_H |
11 | 11 | ||
12 | #include <asm/blackfin.h> /* for SSYNC() */ | 12 | #include <asm/blackfin.h> /* for SSYNC() */ |
13 | #include <asm/sections.h> /* for _ramend */ | ||
13 | 14 | ||
14 | extern void blackfin_icache_flush_range(unsigned long start_address, unsigned long end_address); | 15 | extern void blackfin_icache_flush_range(unsigned long start_address, unsigned long end_address); |
15 | extern void blackfin_dcache_flush_range(unsigned long start_address, unsigned long end_address); | 16 | extern void blackfin_dcache_flush_range(unsigned long start_address, unsigned long end_address); |
diff --git a/arch/blackfin/include/asm/uaccess.h b/arch/blackfin/include/asm/uaccess.h index c03b8532aad3..1c0d190adaef 100644 --- a/arch/blackfin/include/asm/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h | |||
@@ -17,9 +17,7 @@ | |||
17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
18 | 18 | ||
19 | #include <asm/segment.h> | 19 | #include <asm/segment.h> |
20 | #ifdef CONFIG_ACCESS_CHECK | 20 | #include <asm/sections.h> |
21 | # include <asm/bfin-global.h> | ||
22 | #endif | ||
23 | 21 | ||
24 | #define get_ds() (KERNEL_DS) | 22 | #define get_ds() (KERNEL_DS) |
25 | #define get_fs() (current_thread_info()->addr_limit) | 23 | #define get_fs() (current_thread_info()->addr_limit) |
diff --git a/arch/blackfin/kernel/dma-mapping.c b/arch/blackfin/kernel/dma-mapping.c index be81572b89c2..755a0f4b61ae 100644 --- a/arch/blackfin/kernel/dma-mapping.c +++ b/arch/blackfin/kernel/dma-mapping.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/scatterlist.h> | 17 | #include <linux/scatterlist.h> |
18 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
19 | #include <asm/bfin-global.h> | 19 | #include <asm/bfin-global.h> |
20 | #include <asm/sections.h> | ||
20 | 21 | ||
21 | static spinlock_t dma_page_lock; | 22 | static spinlock_t dma_page_lock; |
22 | static unsigned long *dma_page; | 23 | static unsigned long *dma_page; |