diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 12:43:58 -0700 |
| commit | d4bd4b40f8b18ad6a7e269e8f5c06f953f51016d (patch) | |
| tree | 7d8007097c318246179ed396ea0c075b42e46637 /arch/sparc/mm/leon_mm.c | |
| parent | 1765a367a3b5d5e9692949b0c5ec933eff2c0701 (diff) | |
| parent | 1ef48593bd6a508984d1270a1075532628bfd9c8 (diff) | |
| download | linux-next-d4bd4b40f8b18ad6a7e269e8f5c06f953f51016d.tar.gz | |
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:
sparc: sun4m SMP: fix wrong shift instruction in IPI handler
sparc32,leon: Added __init declaration to leon_flush_needed()
sparc/irqs: Do not trace arch_local_{*,irq_*} functions
Diffstat (limited to 'arch/sparc/mm/leon_mm.c')
| -rw-r--r-- | arch/sparc/mm/leon_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/leon_mm.c b/arch/sparc/mm/leon_mm.c index c0e01297e64e..e485a6804998 100644 --- a/arch/sparc/mm/leon_mm.c +++ b/arch/sparc/mm/leon_mm.c @@ -226,7 +226,7 @@ void leon3_getCacheRegs(struct leon3_cacheregs *regs) * Leon2 and Leon3 differ in their way of telling cache information * */ -int leon_flush_needed(void) +int __init leon_flush_needed(void) { int flush_needed = -1; unsigned int ssize, sets; |