From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Schmitz Subject: [PATCH] m68k/atari: atari_scsi.c - use m68k_realnum_memory for FastRAM test Date: Mon, 5 Jun 2017 19:37:59 +1200 Message-ID: <1496648279-15702-1-git-send-email-schmitzmic@gmail.com> Return-path: Sender: linux-m68k-owner@vger.kernel.org To: linux-m68k@vger.kernel.org, fthain@telegraphics.com.au Cc: geert@linux-m68k.org, cts@debian.org, linux-scsi@vger.kernel.org, Michael Schmitz List-Id: linux-scsi@vger.kernel.org m68k_num_memory is unsuitable to test for the presence of FastRAM on CT60 if the kernel is located in FastRAM: in arch/m68k/mm/motorola.c the ST-RAM chunk is skipped and m68k_num_memory is decremented in this case. m68k_realnum_memory still contains the actual number of RAM chunks so use that. Tested by Christian Steiges on his Falcon with kernel loaded in FastRAM - could you please reply with your Tested-by tag, Christian? Signed-off-by: Michael Schmitz --- drivers/scsi/atari_scsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index f792420..a75feeb 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c @@ -776,7 +776,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev) * from/to alternative Ram. */ if (ATARIHW_PRESENT(ST_SCSI) && !ATARIHW_PRESENT(EXTD_DMA) && - m68k_num_memory > 1) { + m68k_realnum_memory > 1) { atari_dma_buffer = atari_stram_alloc(STRAM_BUFFER_SIZE, "SCSI"); if (!atari_dma_buffer) { pr_err(PFX "can't allocate ST-RAM double buffer\n"); -- 1.7.0.4