diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-13 12:04:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-13 12:04:06 -0700 |
| commit | 33fe3aee03acd51fabce00e1bdf39ab5e7d10340 (patch) | |
| tree | 54351cc95872151a2ea6c4dd14f64f588fa5d01c | |
| parent | 54f8c2aa146ac5def8c2337b7b1d3b38c58be393 (diff) | |
| parent | 5bc8c7cdeb6e3d9c1b938b4029d9a22f8dc5cd9d (diff) | |
| download | blackbird-op-linux-33fe3aee03acd51fabce00e1bdf39ab5e7d10340.tar.gz blackbird-op-linux-33fe3aee03acd51fabce00e1bdf39ab5e7d10340.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"Summary:
- Fix for a boot regression introduced in v3.16-rc1,
- Fix for a build issue in -next"
Christoph Hellwig questioned why mach_random_get_entropy should be
exported to modules, and Geert explains that random_get_entropy() is
called by at least the crypto layer and ends up using it on m68k. On
most other architectures it just uses get_cycles() (which is typically
inlined and doesn't need exporting),
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Export mach_random_get_entropy to modules
m68k: Fix boot regression on machines with RAM at non-zero
| -rw-r--r-- | arch/m68k/kernel/head.S | 3 | ||||
| -rw-r--r-- | arch/m68k/kernel/time.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index dbb118e1a4e0..a54788458ca3 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S @@ -921,7 +921,8 @@ L(nocon): jls 1f lsrl #1,%d1 1: - movel %d1,m68k_init_mapped_size + lea %pc@(m68k_init_mapped_size),%a0 + movel %d1,%a0@ mmu_map #PAGE_OFFSET,%pc@(L(phys_kernel_start)),%d1,\ %pc@(m68k_supervisor_cachemode) diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 958f1adb9d0c..3857737e3958 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -11,6 +11,7 @@ */ #include <linux/errno.h> +#include <linux/export.h> #include <linux/module.h> #include <linux/sched.h> #include <linux/kernel.h> @@ -30,6 +31,7 @@ unsigned long (*mach_random_get_entropy)(void); +EXPORT_SYMBOL_GPL(mach_random_get_entropy); /* |
