diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
| commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
| tree | 3c688483e71261f564fc43be3157b337ae340dca /arch/um/os-Linux/helper.c | |
| parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'arch/um/os-Linux/helper.c')
| -rw-r--r-- | arch/um/os-Linux/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index f25c29a12d00..74ca7aabf4e1 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c | |||
| @@ -71,8 +71,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv) | |||
| 71 | data.pre_data = pre_data; | 71 | data.pre_data = pre_data; |
| 72 | data.argv = argv; | 72 | data.argv = argv; |
| 73 | data.fd = fds[1]; | 73 | data.fd = fds[1]; |
| 74 | data.buf = __cant_sleep() ? kmalloc(PATH_MAX, UM_GFP_ATOMIC) : | 74 | data.buf = __cant_sleep() ? uml_kmalloc(PATH_MAX, UM_GFP_ATOMIC) : |
| 75 | kmalloc(PATH_MAX, UM_GFP_KERNEL); | 75 | uml_kmalloc(PATH_MAX, UM_GFP_KERNEL); |
| 76 | pid = clone(helper_child, (void *) sp, CLONE_VM, &data); | 76 | pid = clone(helper_child, (void *) sp, CLONE_VM, &data); |
| 77 | if (pid < 0) { | 77 | if (pid < 0) { |
| 78 | ret = -errno; | 78 | ret = -errno; |