diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
| commit | a057efde80453c68c60e156803578a654b52c39f (patch) | |
| tree | 51c312e95de536b6a29d18a12cfdba72029e09ad /arch/um/os-Linux/sigio.c | |
| parent | 17a1eab7b70d85fc5711f37bb6e530b771736bb7 (diff) | |
| parent | a4a6eed851bb661477654d772807d0e5aee5629c (diff) | |
Merge branch 'for-linus' into for-next
Back-merge the 6.5-devel branch for the clean patch application for
6.6 and resolving merge conflicts.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/um/os-Linux/sigio.c')
| -rw-r--r-- | arch/um/os-Linux/sigio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c index 37d60e72cf26..9e71794839e8 100644 --- a/arch/um/os-Linux/sigio.c +++ b/arch/um/os-Linux/sigio.c @@ -3,7 +3,6 @@ * Copyright (C) 2002 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com) */ -#include <linux/minmax.h> #include <unistd.h> #include <errno.h> #include <fcntl.h> @@ -51,7 +50,7 @@ static struct pollfds all_sigio_fds; static int write_sigio_thread(void *unused) { - struct pollfds *fds; + struct pollfds *fds, tmp; struct pollfd *p; int i, n, respond_fd; char c; @@ -78,7 +77,9 @@ static int write_sigio_thread(void *unused) "write_sigio_thread : " "read on socket failed, " "err = %d\n", errno); - swap(current_poll, next_poll); + tmp = current_poll; + current_poll = next_poll; + next_poll = tmp; respond_fd = sigio_private[1]; } else { |