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

Commit 1c0350bd authored by Chris Zankel's avatar Chris Zankel Committed by Linus Torvalds
Browse files

[PATCH] Xtensa: Add ktermios and minor filename fix 



The kernel termios (ktermios) changes were somehow missed for Xtensa.  This
patch adds the ktermios structure and also includes some minor file name
fix that was missed in the syscall patch.

Signed-off-by: default avatarChris Zankel <chris@zankel.net>
Acked-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8a102eed

arch/xtensa/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ extra-y := head.o vmlinux.lds 




obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o  \

	 setup.o signal.o syscalls.o time.o traps.o vectors.o platform.o  \

	 setup.o signal.o syscall.o time.o traps.o vectors.o platform.o  \

	 pci-dma.o



## windowspill.o

arch/xtensa/kernel/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 *

 */

#include <asm/uaccess.h>

#include <asm/syscalls.h>

#include <asm/syscall.h>

#include <asm/unistd.h>

#include <linux/linkage.h>

#include <linux/stringify.h>

include/asm-xtensa/termbits.h

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,17 @@ struct termios { 
	cc_t c_cc[NCCS];		/* control characters */

};



struct ktermios {

	tcflag_t c_iflag;		/* input mode flags */

	tcflag_t c_oflag;		/* output mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_line;			/* line discipline */

	cc_t c_cc[NCCS];		/* control characters */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ospeed;		/* output speed */

};



/* c_cc characters */



#define VINTR 0

include/asm-xtensa/uaccess.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#ifdef __ASSEMBLY__



#define _ASMLANGUAGE

#include <asm/current.h>

#include <asm/asm-offsets.h>

#include <asm/processor.h>