dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

xtensa: fix compilation somewhat 

* ->put_char changes
 * HIGHMEM is bogus it seems, there is no kmap_atomic() et al
 * some includes

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Chris Zankel <zankel@tensilica.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2009-03-10 12:55:49 -07:00 committed by Linus Torvalds
parent 8ef1f0291a
commit 5a891ed5ad
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/xtensa/Kconfig
View File

@ -103,9 +103,6 @@ config MATH_EMULATION
help
Can we use information of configuration file?
config HIGHMEM
bool "High memory support"
endmenu
menu "Platform options"

2
arch/xtensa/kernel/setup.c
View File

@ -44,6 +44,8 @@
#include <asm/setup.h>
#include <asm/param.h>
#include <platform/hardware.h>
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
struct screen_info screen_info = { 0, 24, 0, 0, 0, 80, 0, 0, 0, 24, 1, 16};
#endif

1
arch/xtensa/kernel/traps.c
View File

@ -30,6 +30,7 @@
#include <linux/stringify.h>
#include <linux/kallsyms.h>
#include <linux/delay.h>
#include <linux/hardirq.h>
#include <asm/ptrace.h>
#include <asm/timex.h>

1
arch/xtensa/mm/fault.c
View File

@ -14,6 +14,7 @@
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/hardirq.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
#include <asm/hardirq.h>

6
arch/xtensa/platforms/iss/console.c
View File

@ -140,16 +140,14 @@ static void rs_poll(unsigned long priv)
}
static void rs_put_char(struct tty_struct *tty, unsigned char ch)
static int rs_put_char(struct tty_struct *tty, unsigned char ch)
{
char buf[2];
if (!tty)
return;
buf[0] = ch;
buf[1] = '\0'; /* Is this NULL necessary? */
__simc (SYS_write, 1, (unsigned long) buf, 1, 0, 0);
return 1;
}
static void rs_flush_chars(struct tty_struct *tty)