Merge branch 'core/types' into x86/x32
authorH. Peter Anvin <hpa@zytor.com>
Fri, 24 Feb 2012 02:35:21 +0000 (18:35 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 24 Feb 2012 02:35:25 +0000 (18:35 -0800)
fs/file.c

index 2d479dd..171f6b4 100644 (file)
--- 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;