The patch titled
Xtensa: Add ktermios and minor filename fix
has been removed from the -mm tree. Its filename was
xtensa-add-ktermios-and-minor-filename-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Xtensa: Add ktermios and minor filename fix
From: Chris Zankel <czankel@xxxxxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/xtensa/kernel/Makefile | 2 +-
arch/xtensa/kernel/syscall.c | 2 +-
include/asm-xtensa/termbits.h | 11 +++++++++++
include/asm-xtensa/uaccess.h | 1 -
4 files changed, 13 insertions(+), 3 deletions(-)
diff -puN arch/xtensa/kernel/Makefile~xtensa-add-ktermios-and-minor-filename-fix arch/xtensa/kernel/Makefile
--- a/arch/xtensa/kernel/Makefile~xtensa-add-ktermios-and-minor-filename-fix
+++ a/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 \
- 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
diff -puN arch/xtensa/kernel/syscall.c~xtensa-add-ktermios-and-minor-filename-fix arch/xtensa/kernel/syscall.c
--- a/arch/xtensa/kernel/syscall.c~xtensa-add-ktermios-and-minor-filename-fix
+++ a/arch/xtensa/kernel/syscall.c
@@ -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>
diff -puN include/asm-xtensa/termbits.h~xtensa-add-ktermios-and-minor-filename-fix include/asm-xtensa/termbits.h
--- a/include/asm-xtensa/termbits.h~xtensa-add-ktermios-and-minor-filename-fix
+++ a/include/asm-xtensa/termbits.h
@@ -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
diff -puN include/asm-xtensa/uaccess.h~xtensa-add-ktermios-and-minor-filename-fix include/asm-xtensa/uaccess.h
--- a/include/asm-xtensa/uaccess.h~xtensa-add-ktermios-and-minor-filename-fix
+++ a/include/asm-xtensa/uaccess.h
@@ -23,7 +23,6 @@
#ifdef __ASSEMBLY__
-#define _ASMLANGUAGE
#include <asm/current.h>
#include <asm/asm-offsets.h>
#include <asm/processor.h>
_
Patches currently in -mm which might be from czankel@xxxxxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
