git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
sys_ia64.c
diff --git
a/arch/ia64/kernel/sys_ia64.c
b/arch/ia64/kernel/sys_ia64.c
index
770fab3
..
c7b943f
100644
(file)
--- 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
return -ENOMEM;
#ifdef CONFIG_HUGETLB_PAGE
return -ENOMEM;
#ifdef CONFIG_HUGETLB_PAGE
- if (REGION_NUMBER(addr) == R
EGIO
N_HPAGE)
+ if (REGION_NUMBER(addr) == R
G
N_HPAGE)
addr = 0;
#endif
if (!addr)
addr = 0;
#endif
if (!addr)
@@
-151,7
+151,7
@@
out:
asmlinkage long
sys_pipe (void)
{
asmlinkage long
sys_pipe (void)
{
- struct pt_regs *regs =
ia64_task
_regs(current);
+ struct pt_regs *regs =
task_pt
_regs(current);
int fd[2];
int retval;
int fd[2];
int retval;