diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-02-24 03:35:21 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-24 03:35:25 +0100 |
| commit | 3f21723079d3ff1c0f71790b4f7fbf9546856eb1 (patch) | |
| tree | f50818f916a8932004a2bb4e19dc69f5a220fa7b | |
| parent | x32: Drop non-__vdso weak symbols from the x32 VDSO (diff) | |
| parent | fs: Fix close_on_exec pointer in alloc_fdtable (diff) | |
| download | linux-3f21723079d3ff1c0f71790b4f7fbf9546856eb1.tar.xz linux-3f21723079d3ff1c0f71790b4f7fbf9546856eb1.zip | |
Merge branch 'core/types' into x86/x32
| -rw-r--r-- | fs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c index 2d479dd8484e..171f6b41b4cd 100644 --- a/fs/file.c +++ b/fs/file.c @@ -179,7 +179,7 @@ static struct fdtable * alloc_fdtable(unsigned int nr) if (!data) goto out_arr; fdt->open_fds = data; - data += nr / BITS_PER_LONG; + data += nr / BITS_PER_BYTE; fdt->close_on_exec = data; fdt->next = NULL; |