A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 12:10:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

Browse source 
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] Add NOTES section
  [PARISC] Use compat_sys_getdents
  [PARISC] Do not allow STI_CONSOLE to be modular
  [PARISC] Clean up sti_flush
  [PARISC] Add dummy isa_(bus|virt)_to_(virt|bus) inlines
  [PARISC] Add empty <asm-parisc/vga.h>
This commit is contained in:
Linus Torvalds 2007-08-27 09:30:52 -07:00
commit d96a2a5c64
7 changed files with 25 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/console/Kconfig
View file

@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
oriented.
config STI_CONSOLE
tristate "STI text console"
bool "STI text console"
depends on PARISC
default y
help

14
drivers/video/console/sticore.c
View file

@ -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