Skip to content

Commit

Permalink
[PATCH] Xtensa: Add ktermios and minor filename fix
Browse files Browse the repository at this point in the history
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: Chris Zankel <chris@zankel.net>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Chris Zankel authored and Linus Torvalds committed Dec 13, 2006
1 parent 8a102ee commit 1c0350b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/xtensa/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/kernel/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions include/asm-xtensa/termbits.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/asm-xtensa/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#ifdef __ASSEMBLY__

#define _ASMLANGUAGE
#include <asm/current.h>
#include <asm/asm-offsets.h>
#include <asm/processor.h>
Expand Down

0 comments on commit 1c0350b

Please sign in to comment.