diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2008-02-12 07:50:57 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2008-02-12 07:50:57 +0000 |
| commit | 37ef611730dfd478680ba3eeeb138f8157ad6690 (patch) | |
| tree | f9e71f7f7681ab54676e9d5d2cb92ddc63414e8d /sys-kernel/tuxonice-sources/files | |
| parent | stable x86, bug 209481 (diff) | |
| download | gentoo-2-37ef611730dfd478680ba3eeeb138f8157ad6690.tar.gz gentoo-2-37ef611730dfd478680ba3eeeb138f8157ad6690.tar.bz2 gentoo-2-37ef611730dfd478680ba3eeeb138f8157ad6690.zip | |
Remove 2.6.23-r10 as tuxonice requires resync for >2.6.23.14 (bug #209755), add 2.6.24-r2 with a patch to correctly support userui (bug #209775).
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-kernel/tuxonice-sources/files')
| -rw-r--r-- | sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch b/sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch new file mode 100644 index 000000000000..f3dee63df0d5 --- /dev/null +++ b/sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch @@ -0,0 +1,23 @@ +From: Nigel Cunningham <nigel@tuxonice.net> +Date: Fri, 25 Jan 2008 20:51:56 +0000 (+1100) +Subject: [TuxOnIce] Fix regression in starting userui (wrong umh_wait arg). +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnigelc%2Ftuxonice-head.git;a=commitdiff_plain;h=c43ab8880c53f2acb55be4614ce97b8c9d3664c2 + +[TuxOnIce] Fix regression in starting userui (wrong umh_wait arg). + +Signed-off-by: Nigel Cunningham <nigel@tuxonice.net> +--- + +diff --git a/kernel/power/tuxonice_netlink.c b/kernel/power/tuxonice_netlink.c +index 80f6c38..f459a7f 100644 +--- a/kernel/power/tuxonice_netlink.c ++++ b/kernel/power/tuxonice_netlink.c +@@ -302,7 +302,7 @@ int toi_netlink_setup(struct user_helper_data *uhd) + } + + if (toi_launch_userspace_program(uhd->program, uhd->netlink_id, +- UMH_NO_WAIT) < 0) { ++ UMH_WAIT_EXEC) < 0) { + printk(KERN_INFO "Launch userspace program failed.\n"); + toi_netlink_close_complete(uhd); + return 1; |