scsi: atari_scsi: Use m68k_realnum_memory for FastRAM test
authorMichael Schmitz <schmitzmic@gmail.com>
Mon, 5 Jun 2017 07:37:59 +0000 (19:37 +1200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 13 Jun 2017 00:48:08 +0000 (20:48 -0400)
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.

Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Tested-by: Christian T. Steigies <cts@debian.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/atari_scsi.c

index f792420c533ecee25036b0c16817eb0db3c564f4..a75feebe6ad6252ad20a89adf7ea0f1b1581defa 100644 (file)
@@ -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");