diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-02-25 21:57:15 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-25 21:57:26 -0800 |
| commit | e0a449cab53814b73faf824284a6b3809b9b1316 (patch) | |
| tree | 47f2b554b3862e7f5ccc8bba6c8c51eac9b34d5c | |
| parent | 00194b2e845da29395ad00c13a884d9acb9306b5 (diff) | |
| parent | 189017c25c8497760c89646c06297c37d6cde072 (diff) | |
| download | op-kernel-dev-e0a449cab53814b73faf824284a6b3809b9b1316.zip op-kernel-dev-e0a449cab53814b73faf824284a6b3809b9b1316.tar.gz | |
Merge branch 'core/types' into x86/x32
| -rw-r--r-- | arch/mips/kernel/kspd.c | 2 | ||||
| -rw-r--r-- | drivers/staging/android/binder.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index 29811f0..84d0639 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c @@ -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); diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 35dd9c3..9446f01 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -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 |
