diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-06-29 02:17:50 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@minerva.i.cabal.ca> | 2007-08-27 00:29:23 -0400 |
| commit | 03b18f1b2afeac76840648b4232d8e53cfb7ec84 (patch) | |
| tree | 5177edf43d8babd8ba766662dc2b664fdd3afa2e /drivers/video/console | |
| parent | fabb8ff4ffa2b6bf89df8ed598551b6aaf632478 (diff) | |
| download | linux-3.10-03b18f1b2afeac76840648b4232d8e53cfb7ec84.tar.gz linux-3.10-03b18f1b2afeac76840648b4232d8e53cfb7ec84.tar.bz2 linux-3.10-03b18f1b2afeac76840648b4232d8e53cfb7ec84.zip | |
[PARISC] Clean up sti_flush
sti_flush is supposed to flush the caches so we can execute the STI rom
we copied to memory. Anything more than flush_icache_range is overkill.
Fixes a missing symbol when built as a module.
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/sticore.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 870017d4497..e9ab657f0bb 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -232,18 +232,14 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x, } -/* FIXME: Do we have another solution for this ? */ -static void sti_flush(unsigned long from, unsigned long len) +static void sti_flush(unsigned long start, unsigned long end) { - flush_data_cache(); - flush_kernel_dcache_range(from, len); - flush_icache_range(from, from+len); + flush_icache_range(start, end); } void __devinit sti_rom_copy(unsigned long base, unsigned long count, void *dest) { - unsigned long dest_len = count; unsigned long dest_start = (unsigned long) dest; /* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */ @@ -260,7 +256,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest) dest++; } - sti_flush(dest_start, dest_len); + sti_flush(dest_start, (unsigned long)dest); } @@ -663,7 +659,6 @@ sti_bmode_font_raw(struct sti_cooked_font *f) static void __devinit sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) { - unsigned long dest_len = count; unsigned long dest_start = (unsigned long) dest; while (count) { @@ -672,7 +667,8 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) base += 4; dest++; } - sti_flush(dest_start, dest_len); + + sti_flush(dest_start, (unsigned long)dest); } static struct sti_rom * __devinit |