| commit | 3f21723079d3ff1c0f71790b4f7fbf9546856eb1 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Thu Feb 23 18:35:21 2012 -0800 |
| committer | H. Peter Anvin <hpa@zytor.com> | Thu Feb 23 18:35:25 2012 -0800 |
| tree | f50818f916a8932004a2bb4e19dc69f5a220fa7b | |
| parent | 862ae3132dc393ab6ea750b9ee9e0e1c276b9abb [diff] | |
| parent | f044db4cb4bf16893812d35b5fbeaaf3e30c9215 [diff] |
Merge branch 'core/types' into x86/x32
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 @@ 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;