diff options
| author | Michael Schmitz <schmitzmic@gmail.com> | 2017-06-05 19:37:59 +1200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-06-12 20:48:08 -0400 |
| commit | 6ff8a3b2a1e9ad5f0b559e7ef3b991918ef1caf9 (patch) | |
| tree | 20acff72f40a47c443df8ad5a8d1af187cbd082d /drivers/scsi/atari_scsi.c | |
| parent | 52eacd619c5ab611db3b193cb213e0e892d5984f (diff) | |
| download | linux-stable-6ff8a3b2a1e9ad5f0b559e7ef3b991918ef1caf9.tar.gz linux-stable-6ff8a3b2a1e9ad5f0b559e7ef3b991918ef1caf9.tar.bz2 linux-stable-6ff8a3b2a1e9ad5f0b559e7ef3b991918ef1caf9.zip | |
scsi: atari_scsi: Use m68k_realnum_memory for FastRAM test
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>
Diffstat (limited to 'drivers/scsi/atari_scsi.c')
| -rw-r--r-- | 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 f792420c533e..a75feebe6ad6 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"); |