Commit 33fe3aee authored Jul 13, 2014 by Linus Torvalds

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

parents 54f8c2aa 5bc8c7cd

arch/m68k/kernel/head.S

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)

arch/m68k/kernel/time.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);


		/*

Admin message