Merge branch 'core/types' into x86/x32

author: H. Peter Anvin <hpa@zytor.com> 2012-02-23 21:35:21 -0500
committer: H. Peter Anvin <hpa@zytor.com> 2012-02-23 21:35:25 -0500
commit: 3f21723079d3ff1c0f71790b4f7fbf9546856eb1 (patch)
tree: f50818f916a8932004a2bb4e19dc69f5a220fa7b
parent: 862ae3132dc393ab6ea750b9ee9e0e1c276b9abb (diff)
parent: f044db4cb4bf16893812d35b5fbeaaf3e30c9215 (diff)
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;
author	H. Peter Anvin <hpa@zytor.com>	2012-02-23 21:35:21 -0500
committer	H. Peter Anvin <hpa@zytor.com>	2012-02-23 21:35:25 -0500
commit	3f21723079d3ff1c0f71790b4f7fbf9546856eb1 (patch)
tree	f50818f916a8932004a2bb4e19dc69f5a220fa7b
parent	862ae3132dc393ab6ea750b9ee9e0e1c276b9abb (diff)
parent	f044db4cb4bf16893812d35b5fbeaaf3e30c9215 (diff)

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)
179	if (!data)	179	if (!data)
180	goto out_arr;	180	goto out_arr;
181	fdt->open_fds = data;	181	fdt->open_fds = data;
182	data += nr / BITS_PER_LONG;	182	data += nr / BITS_PER_BYTE;
183	fdt->close_on_exec = data;	183	fdt->close_on_exec = data;
184	fdt->next = NULL;	184	fdt->next = NULL;
185		185