openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'core/types' into x86/x32

This commit is contained in:
H. Peter Anvin 2012-02-25 21:57:15 -08:00
parent 00194b2e84 189017c25c
commit e0a449cab5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/kernel/kspd.c
View File

@ -326,7 +326,7 @@ static void sp_cleanup(void)
i = j * __NFDBITS; i = j * __NFDBITS;
if (i >= fdt->max_fds) if (i >= fdt->max_fds)
break; break;
set = fdt->open_fds->fds_bits[j++]; set = fdt->open_fds[j++];
while (set) { while (set) {
if (set & 1) { if (set & 1) {
struct file * file = xchg(&fdt->fd[i], NULL); struct file * file = xchg(&fdt->fd[i], NULL);

3
drivers/staging/android/binder.c
View File

@ -379,8 +379,7 @@ int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
repeat: repeat:
fdt = files_fdtable(files); fdt = files_fdtable(files);
fd = find_next_zero_bit(fdt->open_fds->fds_bits, fdt->max_fds, fd = find_next_zero_bit(fdt->open_fds, fdt->max_fds, files->next_fd);
files->next_fd);
/* /*
* N.B. For clone tasks sharing a files structure, this test * N.B. For clone tasks sharing a files structure, this test