Hi Jens, If you don't object, I'd like to take this one through the m68k tree, as it depends on a new m68k platform function. On Sun, Mar 30, 2014 at 1:01 AM, Michael Schmitz <schmitzmic@xxxxxxxxx> wrote:
With new ST-RAM allocation to work also when the kernel is running from FastRAM, use dedicated virt/phys translation for this case. Signed-off-by: Michael Schmitz <schmitz@xxxxxxxxxx> --- drivers/block/ataflop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 0e30c6e..f54655a 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -1952,7 +1952,7 @@ static int __init atari_floppy_init (void) goto Enomem; } TrackBuffer = DMABuffer + 512; - PhysDMABuffer = virt_to_phys(DMABuffer); + PhysDMABuffer = atari_stram_to_phys(DMABuffer); PhysTrackBuffer = virt_to_phys(TrackBuffer); BufferDrive = BufferSide = BufferTrack = -1; -- 1.7.0.4
Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html