diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 16:08:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 16:08:01 -0400 |
commit | 6f58d79598c184dc4f18ceddfaa5fa7483bce0a5 (patch) | |
tree | 2dfb9a7c1e947086c20960d4fa20458266473f0a /include/asm-sparc64/spitfire.h | |
parent | ca1a6ba57c5fca755b4ac7a13395bca2e2e371b1 (diff) | |
parent | 6d008153234c4cccae7bb0170defeea18258db4a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: exec PT_DTRACE
[SPARC64]: Use shorter list_splice_init() for brevity.
[SPARC64]: Remove most limitations to kernel image size.
Diffstat (limited to 'include/asm-sparc64/spitfire.h')
-rw-r--r-- | include/asm-sparc64/spitfire.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h index 63b7040e8134..985ea7e31992 100644 --- a/include/asm-sparc64/spitfire.h +++ b/include/asm-sparc64/spitfire.h | |||
@@ -63,6 +63,8 @@ extern void cheetah_enable_pcache(void); | |||
63 | SPITFIRE_HIGHEST_LOCKED_TLBENT : \ | 63 | SPITFIRE_HIGHEST_LOCKED_TLBENT : \ |
64 | CHEETAH_HIGHEST_LOCKED_TLBENT) | 64 | CHEETAH_HIGHEST_LOCKED_TLBENT) |
65 | 65 | ||
66 | extern int num_kernel_image_mappings; | ||
67 | |||
66 | /* The data cache is write through, so this just invalidates the | 68 | /* The data cache is write through, so this just invalidates the |
67 | * specified line. | 69 | * specified line. |
68 | */ | 70 | */ |