diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 10:29:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 10:29:29 -0400 |
| commit | 7ac992ef615c66a05ebb831915935e83c0ec8e05 (patch) | |
| tree | 0bef479fccb4e73733fab628dc525a5959bba925 /arch/microblaze/mm/init.c | |
| parent | 6a251b0ab67989f468f4cb65179e0cf40cf8c295 (diff) | |
| parent | a5e48b88da225580394f825ffe67e444b050074b (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix module loading on system with WB cache
microblaze: export assembly functions used by modules
microblaze: Remove powerpc code from Microblaze port
microblaze: Remove compilation warnings in cache macro
microblaze: export assembly functions used by modules
microblaze: fix get_user/put_user side-effects
microblaze: re-enable interrupts before calling schedule
Diffstat (limited to 'arch/microblaze/mm/init.c')
| -rw-r--r-- | arch/microblaze/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index f42c2dde8b1c..cca3579d4268 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
| @@ -47,6 +47,7 @@ unsigned long memory_start; | |||
| 47 | EXPORT_SYMBOL(memory_start); | 47 | EXPORT_SYMBOL(memory_start); |
| 48 | unsigned long memory_end; /* due to mm/nommu.c */ | 48 | unsigned long memory_end; /* due to mm/nommu.c */ |
| 49 | unsigned long memory_size; | 49 | unsigned long memory_size; |
| 50 | EXPORT_SYMBOL(memory_size); | ||
| 50 | 51 | ||
| 51 | /* | 52 | /* |
| 52 | * paging_init() sets up the page tables - in fact we've already done this. | 53 | * paging_init() sets up the page tables - in fact we've already done this. |