kernel.git/arch/m68k/sun3, branch linux-4.6.y

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2016-01-12T18:33:51Z

Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Provide __phys_to_pfn() and __pfn_to_phys() m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular m68k/defconfig: Update defconfigs for v4.4-rc1 m68k/mac: Kill psc_present

m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular

2016-01-10T12:56:40Z

Fixes: 3ff228af84b5 ("atari_scsi: Convert to platform device") Fixes: 0d31f8759109 ("sun3_scsi: Convert to platform device") Reported-by: Michael Schmitz Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven

m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn

2015-11-22T10:35:25Z

If max_pfn is not initialized, the various /proc/kpage* files are empty, and selftests/vm/mlock2-tests will fail. max_pfn is also used by the block layer to calculate DMA masks. Switch from init_bootmem_node() to init_bootmem(), as there's only one memory node on Sun-3. This will initialize min_low_pfn and max_low_pfn, which was also not done before. Signed-off-by: Geert Uytterhoeven Acked-by: Greg Ungerer

m68k/sun3: Use %pM format specifier to print ethernet address

2015-09-13T12:37:26Z

printk() supports %pM format specifier for printing 6-byte MAC/FDDI addresses in hex notation small buffers, let's use it intead of %x:%x... Signed-off-by: Alexander Kuleshov Signed-off-by: Geert Uytterhoeven

sun3_scsi: Convert to platform device

2014-11-20T08:11:15Z

Convert sun3_scsi to platform device and eliminate scsi_register(). Signed-off-by: Finn Thain Reviewed-by: Hannes Reinecke Acked-by: Geert Uytterhoeven Signed-off-by: Christoph Hellwig

m68k/sun3: Dynamically allocate the table to track IOMMU use

2013-11-26T10:08:59Z

As Sun 3 kernels cannot be multi-platform due to the different Sun 3 MMU type, it made sense to statically allocate the table to track IOMMU use. However, Sun 3x kernels can be multi-platform. Furthermore, Sun 3x uses a larger table than Sun 3 (8192 bytes instead of 512 bytes). Hence switch to dynamic allocation of this table using the bootmem allocator to avoid wasting 8192 bytes when not running on a Sun 3x. As this allocator returns zeroed memory, there's no need to explicitly initialize the table to zeroes. Signed-off-by: Geert Uytterhoeven

m68k: Mark functions only called from setup_arch() __init

2013-11-26T10:08:54Z

Some functions that are only called (indirectly) from setup_arch() lack __init annotations. Signed-off-by: Geert Uytterhoeven

m68k/sun3: remove inline marking of EXPORT_SYMBOL functions

2013-06-24T17:44:18Z

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Denis Efremov Signed-off-by: Geert Uytterhoeven

m68k: set arch_gettimeoffset directly

2012-12-24T16:36:34Z

remove m68k's mach_gettimeoffset function pointer, and instead directly set the arch_gettimeoffset function pointer. This requires multiplying all function results by 1000, since the removed m68k_gettimeoffset() did this. Also, s/unsigned long/u32/ just to make the function prototypes exactly match that of arch_gettimeoffset. Cc: Joshua Thompson Cc: Sam Creasey Acked-by: Geert Uytterhoeven Acked-by: Phil Blundell Signed-off-by: Stephen Warren

m68k/sun3: Get interrupts working again

2012-11-14T07:50:57Z

SUN3 Intregister is not for enabling individual interrupts, but to enable special interrupts. So using it for interrupt enable/disable was wrong. The clock interrupt needs some special treatment to keep ticking. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Geert Uytterhoeven