diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:41 +0100 |
| commit | e898c6706869fdcbd68b1e7fb0ac7461d98710fe (patch) | |
| tree | 28054da88ddda324f78f27083b14328113941fbc /kernel/exit.c | |
| parent | x86: Use enum instead of literals for trap values (diff) | |
| parent | x32: Add ptrace for x32 (diff) | |
| download | linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.tar.xz linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.zip | |
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 4b4042f9bc6a..4db020015f14 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -473,7 +473,7 @@ static void close_files(struct files_struct * files) 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); |