git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
[pandora-kernel.git]
/
arch
/
um
/
kernel
/
um_arch.c
diff --git
a/arch/um/kernel/um_arch.c
b/arch/um/kernel/um_arch.c
index
9db85b2
..
8d84250
100644
(file)
--- a/
arch/um/kernel/um_arch.c
+++ b/
arch/um/kernel/um_arch.c
@@
-274,7
+274,7
@@
int __init linux_main(int argc, char **argv)
if (have_root == 0)
add_arg(DEFAULT_COMMAND_LINE);
- host_task_size = os_get_t
ask_size
();
+ host_task_size = os_get_t
op_address
();
/*
* TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps
* out