diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 14:50:39 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 14:50:39 (GMT) |
| commit | ffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b (patch) | |
| tree | 931c3c2f1dc483539d2349f05c9bbf1e4447c41f /arch/um/os-Linux/start_up.c | |
| parent | 152fcb2784c9305e19e7caee2932b9e32b0a1d41 (diff) | |
| parent | 2116bda6ad937d7acb6e2316fd9e65ad6ca01d42 (diff) | |
| download | linux-ffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"This update brings various fixes.
Nothing special...
In my local queue I have some more fixes which will be sent later to
you. 3.9 uncovered strange UML issues. :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Use tty_port in SIGWINCH handler
um: Use tty_port_operations->destruct
um: fix build failure due to mess-up of sig_info protorype
um: add missing declaration of 'getrlimit()' and friends
net : enable tx time stamping in the vde driver.
hostfs: fix a not needed double check
Diffstat (limited to 'arch/um/os-Linux/start_up.c')
| -rw-r--r-- | arch/um/os-Linux/start_up.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index da4b9e9..337518c 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c @@ -15,6 +15,8 @@ #include <sys/mman.h> #include <sys/stat.h> #include <sys/wait.h> +#include <sys/time.h> +#include <sys/resource.h> #include <asm/unistd.h> #include <init.h> #include <os.h> |