aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Kconfig2
-rw-r--r--arch/um/Makefile2
-rw-r--r--arch/um/drivers/line.c2
-rw-r--r--arch/um/include/sysdep-x86_64/ptrace_user.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 76e85bbaea55..d75307589d74 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -257,7 +257,7 @@ config UML_REAL_TIME_CLOCK
257 UML and spend long times with UML stopped at a breakpoint. In this 257 UML and spend long times with UML stopped at a breakpoint. In this
258 case, when UML is restarted, it will call the timer enough times to make 258 case, when UML is restarted, it will call the timer enough times to make
259 up for the time spent at the breakpoint. This could result in a 259 up for the time spent at the breakpoint. This could result in a
260 noticable lag. If this is a problem, then disable this option. 260 noticeable lag. If this is a problem, then disable this option.
261 261
262endmenu 262endmenu
263 263
diff --git a/arch/um/Makefile b/arch/um/Makefile
index f6ad832faf13..c8016a98483b 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -102,7 +102,7 @@ linux: vmlinux
102define archhelp 102define archhelp
103 echo '* linux - Binary kernel image (./linux) - for backward' 103 echo '* linux - Binary kernel image (./linux) - for backward'
104 echo ' compatibility only, this creates a hard link to the' 104 echo ' compatibility only, this creates a hard link to the'
105 echo ' real kernel binary, the the "vmlinux" binary you' 105 echo ' real kernel binary, the "vmlinux" binary you'
106 echo ' find in the kernel root.' 106 echo ' find in the kernel root.'
107endef 107endef
108 108
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 24747a413785..cfd9f01fd464 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -497,7 +497,7 @@ void close_lines(struct line *lines, int nlines)
497} 497}
498 498
499/* Common setup code for both startup command line and mconsole initialization. 499/* Common setup code for both startup command line and mconsole initialization.
500 * @lines contains the the array (of size @num) to modify; 500 * @lines contains the array (of size @num) to modify;
501 * @init is the setup string; 501 * @init is the setup string;
502 */ 502 */
503 503
diff --git a/arch/um/include/sysdep-x86_64/ptrace_user.h b/arch/um/include/sysdep-x86_64/ptrace_user.h
index 128faf027364..4cd61a852fab 100644
--- a/arch/um/include/sysdep-x86_64/ptrace_user.h
+++ b/arch/um/include/sysdep-x86_64/ptrace_user.h
@@ -55,7 +55,7 @@
55#define PTRACE_OLDSETOPTIONS 21 55#define PTRACE_OLDSETOPTIONS 21
56#endif 56#endif
57 57
58/* These are before the system call, so the the system call number is RAX 58/* These are before the system call, so the system call number is RAX
59 * rather than ORIG_RAX, and arg4 is R10 rather than RCX 59 * rather than ORIG_RAX, and arg4 is R10 rather than RCX
60 */ 60 */
61#define REGS_SYSCALL_NR PT_INDEX(RAX) 61#define REGS_SYSCALL_NR PT_INDEX(RAX)