diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/microblaze/mm/init.c | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
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 a44892e7cd5b..a57cedf36715 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
| @@ -41,6 +41,7 @@ char *klimit = _end; | |||
| 41 | * have available. | 41 | * have available. |
| 42 | */ | 42 | */ |
| 43 | unsigned long memory_start; | 43 | unsigned long memory_start; |
| 44 | EXPORT_SYMBOL(memory_start); | ||
| 44 | unsigned long memory_end; /* due to mm/nommu.c */ | 45 | unsigned long memory_end; /* due to mm/nommu.c */ |
| 45 | unsigned long memory_size; | 46 | unsigned long memory_size; |
| 46 | 47 | ||