aboutsummaryrefslogtreecommitdiff
path: root/arch/um/drivers/port_user.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/drivers/port_user.c')
-rw-r--r--arch/um/drivers/port_user.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index addd7590265..9a8e1b64c22 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -10,11 +10,9 @@
#include <unistd.h>
#include <netinet/in.h>
#include "chan_user.h"
-#include "kern_constants.h"
-#include "os.h"
+#include <os.h>
#include "port.h"
-#include "um_malloc.h"
-#include "user.h"
+#include <um_malloc.h>
struct port_chan {
int raw;
@@ -47,7 +45,7 @@ static void *port_init(char *str, int device, const struct chan_opts *opts)
if (kern_data == NULL)
return NULL;
- data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+ data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
if (data == NULL)
goto err;
@@ -153,7 +151,7 @@ struct port_pre_exec_data {
int pipe_fd;
};
-void port_pre_exec(void *arg)
+static void port_pre_exec(void *arg)
{
struct port_pre_exec_data *data = arg;