Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+4 -1
+2 -1
arch/m68k/kernel/head.S
··· 921 921 jls 1f 922 922 lsrl #1,%d1 923 923 1: 924 - movel %d1,m68k_init_mapped_size 924 + lea %pc@(m68k_init_mapped_size),%a0 925 + movel %d1,%a0@ 925 926 mmu_map #PAGE_OFFSET,%pc@(L(phys_kernel_start)),%d1,\ 926 927 %pc@(m68k_supervisor_cachemode) 927 928
+2
arch/m68k/kernel/time.c
··· 11 11 */ 12 12 13 13 #include <linux/errno.h> 14 + #include <linux/export.h> 14 15 #include <linux/module.h> 15 16 #include <linux/sched.h> 16 17 #include <linux/kernel.h> ··· 31 30 32 31 33 32 unsigned long (*mach_random_get_entropy)(void); 33 + EXPORT_SYMBOL_GPL(mach_random_get_entropy); 34 34 35 35 36 36 /*