diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-15 20:03:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-15 20:03:50 -0800 |
| commit | eb14f019597cd86c21a6c601d7e900f40030c2e7 (patch) | |
| tree | 36fb2f36a1747f98988f87215db1eef3a71d45eb /arch/um | |
| parent | 9a4a84294b0d60b8c287131478f743ba2bc68949 (diff) | |
| parent | a3dd15444baa9c7522c8457ab564c41219dfb44c (diff) | |
| download | linux-rpi3-eb14f019597cd86c21a6c601d7e900f40030c2e7.tar.gz linux-rpi3-eb14f019597cd86c21a6c601d7e900f40030c2e7.tar.bz2 linux-rpi3-eb14f019597cd86c21a6c601d7e900f40030c2e7.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 19d579d74d27..8f44ebb0dec8 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -16,6 +16,8 @@ #include <linux/slab.h> #include <linux/syscalls.h> #include <linux/utsname.h> +#include <linux/socket.h> +#include <linux/un.h> #include <linux/workqueue.h> #include <linux/mutex.h> #include <asm/uaccess.h> @@ -785,7 +787,7 @@ static int __init mconsole_init(void) /* long to avoid size mismatch warnings from gcc */ long sock; int err; - char file[256]; + char file[UNIX_PATH_MAX]; if (umid_file_name("mconsole", file, sizeof(file))) return -1; |