diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 19:45:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 19:45:02 -0400 |
| commit | 1871e845e564c4e17f561ec4e5e4bb6bb8578685 (patch) | |
| tree | bcfb62936710321f48bee64153e05f313dc371d0 /arch/um/os-Linux/internal.h | |
| parent | a6dc77254b3c3eb0307b372b77b861d5cd2ead08 (diff) | |
| parent | b070989aeb47ccdfe56d95e046bd317baa47f4fa (diff) | |
Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"This patch set contains mostly fixes and cleanups. The UML tty driver
uses now tty_port and is no longer broken like hell :-)"
* 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Add arch/x86/um to MAINTAINERS
um: pass siginfo to guest process
um: fix ubd_file_size for read-only files
um: pull interrupt_end() into userspace()
um: split syscall_trace(), pass pt_regs to it
um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs
um: set BLK_CGROUP=y in defconfig
um: remove count_lock
um: fully use tty_port
um: Remove dead code
um: remove line_ioctl()
TTY: um/line, use tty from tty_port
TTY: um/line, add tty_port
Diffstat (limited to 'arch/um/os-Linux/internal.h')
| -rw-r--r-- | arch/um/os-Linux/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/internal.h b/arch/um/os-Linux/internal.h index 2c3c3ecd8c01..0dc2c9f135f6 100644 --- a/arch/um/os-Linux/internal.h +++ b/arch/um/os-Linux/internal.h | |||
| @@ -1 +1 @@ | |||
| void alarm_handler(int, mcontext_t *); | void alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc); | ||