summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-02-23 18:35:21 -0800
committerH. Peter Anvin <hpa@zytor.com>2012-02-23 18:35:25 -0800
commit3f21723079d3ff1c0f71790b4f7fbf9546856eb1 (patch)
treef50818f916a8932004a2bb4e19dc69f5a220fa7b
parent862ae3132dc393ab6ea750b9ee9e0e1c276b9abb (diff)
parentf044db4cb4bf16893812d35b5fbeaaf3e30c9215 (diff)
downloadop-kernel-dev-3f21723079d3ff1c0f71790b4f7fbf9546856eb1.zip
op-kernel-dev-3f21723079d3ff1c0f71790b4f7fbf9546856eb1.tar.gz
Merge branch 'core/types' into x86/x32
-rw-r--r--fs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c
index 2d479dd..171f6b4 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;
OpenPOWER on IntegriCloud