Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0a449ca authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'core/types' into x86/x32

parents 00194b2e 189017c2

arch/mips/kernel/kspd.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static void sp_cleanup(void) 
		i = j * __NFDBITS;

		if (i >= fdt->max_fds)

			break;

		set = fdt->open_fds->fds_bits[j++];

		set = fdt->open_fds[j++];

		while (set) {

			if (set & 1) {

				struct file * file = xchg(&fdt->fd[i], NULL);

drivers/staging/android/binder.c

+1 −2
Original line number Diff line number Diff line
@@ -379,8 +379,7 @@ int task_get_unused_fd_flags(struct binder_proc *proc, int flags) 


repeat:

	fdt = files_fdtable(files);

	fd = find_next_zero_bit(fdt->open_fds->fds_bits, fdt->max_fds,

				files->next_fd);

	fd = find_next_zero_bit(fdt->open_fds, fdt->max_fds, files->next_fd);



	/*

	 * N.B. For clone tasks sharing a files structure, this test