diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /fs/dcache.c | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 4547f66884a0..937df0fb0da5 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -2092,7 +2092,7 @@ Elong: | |||
| 2092 | * return NULL; | 2092 | * return NULL; |
| 2093 | * } | 2093 | * } |
| 2094 | */ | 2094 | */ |
| 2095 | asmlinkage long sys_getcwd(char __user *buf, unsigned long size) | 2095 | SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size) |
| 2096 | { | 2096 | { |
| 2097 | int error; | 2097 | int error; |
| 2098 | struct path pwd, root; | 2098 | struct path pwd, root; |