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 /fs/minix/inode.c | |
| parent | 54f8c2aa146ac5def8c2337b7b1d3b38c58be393 (diff) | |
| parent | 5bc8c7cdeb6e3d9c1b938b4029d9a22f8dc5cd9d (diff) | |
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
Diffstat (limited to 'fs/minix/inode.c')
0 files changed, 0 insertions, 0 deletions