diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-01 13:58:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-01 13:58:18 -0400 |
| commit | 712fbdd33306aa07085d1e648b5f3d45d7943794 (patch) | |
| tree | 5e8c905d983df3d54ae27e9c080fc6cfafe180eb /arch/ia64/kernel/sys_ia64.c | |
| parent | b25dd2842bcaef2413db7a06c67034b187aa007f (diff) | |
| parent | 986632fd7033a0199f9548c44606377cdf1f4a80 (diff) | |
Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/sys_ia64.c')
| -rw-r--r-- | arch/ia64/kernel/sys_ia64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index 770fab37928e..f2dbcd1db0d4 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c | |||
| @@ -35,7 +35,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len | |||
| 35 | return -ENOMEM; | 35 | return -ENOMEM; |
| 36 | 36 | ||
| 37 | #ifdef CONFIG_HUGETLB_PAGE | 37 | #ifdef CONFIG_HUGETLB_PAGE |
| 38 | if (REGION_NUMBER(addr) == REGION_HPAGE) | 38 | if (REGION_NUMBER(addr) == RGN_HPAGE) |
| 39 | addr = 0; | 39 | addr = 0; |
| 40 | #endif | 40 | #endif |
| 41 | if (!addr) | 41 | if (!addr) |