diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 14:00:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 14:00:58 -0800 |
| commit | c40f6f8bbc4cbd2902671aacd587400ddca62627 (patch) | |
| tree | a991e5521e10943f4457fb7f494e00aec75cc7df /init | |
| parent | 1a7d0f0bec4be078ce2cfb11538c0f4ffbbed8e5 (diff) | |
| parent | cb6ff208076b5f434db1b8c983429269d719cef5 (diff) | |
| download | linux-c40f6f8bbc4cbd2902671aacd587400ddca62627.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu:
NOMMU: Support XIP on initramfs
NOMMU: Teach kobjsize() about VMA regions.
FLAT: Don't attempt to expand the userspace stack to fill the space allocated
FDPIC: Don't attempt to expand the userspace stack to fill the space allocated
NOMMU: Improve procfs output using per-MM VMAs
NOMMU: Make mmap allocation page trimming behaviour configurable.
NOMMU: Make VMAs per MM as for MMU-mode linux
NOMMU: Delete askedalloc and realalloc variables
NOMMU: Rename ARM's struct vm_region
NOMMU: Fix cleanup handling in ramfs_nommu_get_umapped_area()
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 4f5ba75aaa7c..d9c941c0c3ca 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -317,6 +317,7 @@ static int __init do_name(void) if (wfd >= 0) { sys_fchown(wfd, uid, gid); sys_fchmod(wfd, mode); + sys_ftruncate(wfd, body_len); vcollected = kstrdup(collected, GFP_KERNEL); state = CopyFile; } |