diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
| commit | d763d5edf945eec47bd443b699f174976f0afc13 (patch) | |
| tree | 3e5cd46b9a783999716bf92176854f4f1215d930 /arch/um/include/os.h | |
| parent | 790e2a290b499b0400254e6870ec27969065d122 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tracing/mmiotrace
Diffstat (limited to 'arch/um/include/os.h')
| -rw-r--r-- | arch/um/include/os.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index e2716ac8889a..db5be46e3e18 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
| @@ -299,6 +299,6 @@ extern int os_arch_prctl(int pid, int code, unsigned long *addr); | |||
| 299 | extern int get_pty(void); | 299 | extern int get_pty(void); |
| 300 | 300 | ||
| 301 | /* sys-$ARCH/task_size.c */ | 301 | /* sys-$ARCH/task_size.c */ |
| 302 | extern unsigned long os_get_task_size(void); | 302 | extern unsigned long os_get_top_address(void); |
| 303 | 303 | ||
| 304 | #endif | 304 | #endif |