diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 10:39:02 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 10:39:02 -0500 |
| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 (patch) | |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 /arch/arm/mm/proc-syms.c | |
| parent | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 (diff) | |
| parent | b5ee9002583fc14e6d45a04c18f208987a8fbced (diff) | |
Merge branch 'highmem' into devel
Conflicts:
arch/arm/mach-clps7500/include/mach/memory.h
Diffstat (limited to 'arch/arm/mm/proc-syms.c')
| -rw-r--r-- | arch/arm/mm/proc-syms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c index 2b5ba396e3a6..4ad3bf291ad3 100644 --- a/arch/arm/mm/proc-syms.c +++ b/arch/arm/mm/proc-syms.c | |||
| @@ -33,8 +33,8 @@ EXPORT_SYMBOL(cpu_cache); | |||
| 33 | 33 | ||
| 34 | #ifdef CONFIG_MMU | 34 | #ifdef CONFIG_MMU |
| 35 | #ifndef MULTI_USER | 35 | #ifndef MULTI_USER |
| 36 | EXPORT_SYMBOL(__cpu_clear_user_page); | 36 | EXPORT_SYMBOL(__cpu_clear_user_highpage); |
| 37 | EXPORT_SYMBOL(__cpu_copy_user_page); | 37 | EXPORT_SYMBOL(__cpu_copy_user_highpage); |
| 38 | #else | 38 | #else |
| 39 | EXPORT_SYMBOL(cpu_user); | 39 | EXPORT_SYMBOL(cpu_user); |
| 40 | #endif | 40 | #endif |