Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a891ed5 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

xtensa: fix compilation somewhat 



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

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarChris Zankel <zankel@tensilica.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8ef1f029

arch/xtensa/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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"

arch/xtensa/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/xtensa/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/xtensa/mm/fault.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/xtensa/platforms/iss/console.c

+2 −4
Original line number Diff line number Diff line
@@ -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)