Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alexey Dobriyan and committed by
Linus Torvalds
5a891ed5 8ef1f029

+6 -7
-3
arch/xtensa/Kconfig
··· 103 103 help 104 104 Can we use information of configuration file? 105 105 106 - config HIGHMEM 107 - bool "High memory support" 108 - 109 106 endmenu 110 107 111 108 menu "Platform options"
+2
arch/xtensa/kernel/setup.c
··· 44 44 #include <asm/setup.h> 45 45 #include <asm/param.h> 46 46 47 + #include <platform/hardware.h> 48 + 47 49 #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) 48 50 struct screen_info screen_info = { 0, 24, 0, 0, 0, 80, 0, 0, 0, 24, 1, 16}; 49 51 #endif
+1
arch/xtensa/kernel/traps.c
··· 30 30 #include <linux/stringify.h> 31 31 #include <linux/kallsyms.h> 32 32 #include <linux/delay.h> 33 + #include <linux/hardirq.h> 33 34 34 35 #include <asm/ptrace.h> 35 36 #include <asm/timex.h>
+1
arch/xtensa/mm/fault.c
··· 14 14 15 15 #include <linux/mm.h> 16 16 #include <linux/module.h> 17 + #include <linux/hardirq.h> 17 18 #include <asm/mmu_context.h> 18 19 #include <asm/cacheflush.h> 19 20 #include <asm/hardirq.h>
+2 -4
arch/xtensa/platforms/iss/console.c
··· 140 140 } 141 141 142 142 143 - static void rs_put_char(struct tty_struct *tty, unsigned char ch) 143 + static int rs_put_char(struct tty_struct *tty, unsigned char ch) 144 144 { 145 145 char buf[2]; 146 - 147 - if (!tty) 148 - return; 149 146 150 147 buf[0] = ch; 151 148 buf[1] = '\0'; /* Is this NULL necessary? */ 152 149 __simc (SYS_write, 1, (unsigned long) buf, 1, 0, 0); 150 + return 1; 153 151 } 154 152 155 153 static void rs_flush_chars(struct tty_struct *tty)