diff options
author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/sparc64/mm/init.c | |
parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/sparc64/mm/init.c')
-rw-r--r-- | arch/sparc64/mm/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 3fbaf342a452..fdb1ebb308c9 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/pagemap.h> | 19 | #include <linux/pagemap.h> |
20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
21 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
22 | #include <linux/kprobes.h> | ||
22 | 23 | ||
23 | #include <asm/head.h> | 24 | #include <asm/head.h> |
24 | #include <asm/system.h> | 25 | #include <asm/system.h> |
@@ -250,7 +251,7 @@ out: | |||
250 | put_cpu(); | 251 | put_cpu(); |
251 | } | 252 | } |
252 | 253 | ||
253 | void flush_icache_range(unsigned long start, unsigned long end) | 254 | void __kprobes flush_icache_range(unsigned long start, unsigned long end) |
254 | { | 255 | { |
255 | /* Cheetah has coherent I-cache. */ | 256 | /* Cheetah has coherent I-cache. */ |
256 | if (tlb_type == spitfire) { | 257 | if (tlb_type == spitfire) { |