浏览代码

[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: 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>
Chris Zankel 18 年之前
父节点
当前提交
1c0350bd0c
共有 4 个文件被更改,包括 13 次插入3 次删除
  1. 1 1
      arch/xtensa/kernel/Makefile
  2. 1 1
      arch/xtensa/kernel/syscall.c
  3. 11 0
      include/asm-xtensa/termbits.h
  4. 0 1
      include/asm-xtensa/uaccess.h

+ 1 - 1
arch/xtensa/kernel/Makefile

@@ -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  \
 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
 	 pci-dma.o
 
 
 ## windowspill.o
 ## windowspill.o

+ 1 - 1
arch/xtensa/kernel/syscall.c

@@ -16,7 +16,7 @@
  *
  *
  */
  */
 #include <asm/uaccess.h>
 #include <asm/uaccess.h>
-#include <asm/syscalls.h>
+#include <asm/syscall.h>
 #include <asm/unistd.h>
 #include <asm/unistd.h>
 #include <linux/linkage.h>
 #include <linux/linkage.h>
 #include <linux/stringify.h>
 #include <linux/stringify.h>

+ 11 - 0
include/asm-xtensa/termbits.h

@@ -30,6 +30,17 @@ struct termios {
 	cc_t c_cc[NCCS];		/* control characters */
 	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 */
 /* c_cc characters */
 
 
 #define VINTR 0
 #define VINTR 0

+ 0 - 1
include/asm-xtensa/uaccess.h

@@ -23,7 +23,6 @@
 
 
 #ifdef __ASSEMBLY__
 #ifdef __ASSEMBLY__
 
 
-#define _ASMLANGUAGE
 #include <asm/current.h>
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>
 #include <asm/processor.h>