Commit d303402c authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML fixes from Richard Weinberger:

 - Two missing includes which caused build issues on recent systems

 - Correctly set TRANS_GRE_LEN in our vector network driver

* tag 'for-linus-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Fix typo in vector driver transport option definition
  um: syscall.c: include <asm/unistd.h>
  um: Fix xor.h include
parents 2ea1940b 2e27d33d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define TRANS_TAP_LEN strlen(TRANS_TAP) #define TRANS_TAP_LEN strlen(TRANS_TAP)
#define TRANS_GRE "gre" #define TRANS_GRE "gre"
#define TRANS_GRE_LEN strlen(TRANS_RAW) #define TRANS_GRE_LEN strlen(TRANS_GRE)
#define TRANS_L2TPV3 "l2tpv3" #define TRANS_L2TPV3 "l2tpv3"
#define TRANS_L2TPV3_LEN strlen(TRANS_L2TPV3) #define TRANS_L2TPV3_LEN strlen(TRANS_L2TPV3)
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <asm-generic/xor.h> #include <asm-generic/xor.h>
#include <shared/timer-internal.h> #include <linux/time-internal.h>
/* pick an arbitrary one - measuring isn't possible with inf-cpu */ /* pick an arbitrary one - measuring isn't possible with inf-cpu */
#define XOR_SELECT_TEMPLATE(x) \ #define XOR_SELECT_TEMPLATE(x) \
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <sysdep/ptrace_user.h> #include <sysdep/ptrace_user.h>
#include <sysdep/syscalls.h> #include <sysdep/syscalls.h>
#include <linux/time-internal.h> #include <linux/time-internal.h>
#include <asm/unistd.h>
void handle_syscall(struct uml_pt_regs *r) void handle_syscall(struct uml_pt_regs *r)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment