diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /fs/ramfs | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'fs/ramfs')
| -rw-r--r-- | fs/ramfs/file-nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index bfe5dbf100..61cbe1ef06 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c | |||
| @@ -232,7 +232,7 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file, | |||
| 232 | unsigned long pgoff, unsigned long flags) | 232 | unsigned long pgoff, unsigned long flags) |
| 233 | { | 233 | { |
| 234 | unsigned long maxpages, lpages, nr, loop, ret; | 234 | unsigned long maxpages, lpages, nr, loop, ret; |
| 235 | struct inode *inode = file->f_dentry->d_inode; | 235 | struct inode *inode = file->f_path.dentry->d_inode; |
| 236 | struct page **pages = NULL, **ptr, *page; | 236 | struct page **pages = NULL, **ptr, *page; |
| 237 | loff_t isize; | 237 | loff_t isize; |
| 238 | 238 | ||