# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.957 -> 1.958 # drivers/scsi/53c700.c 1.21 -> 1.22 # drivers/scsi/sym53c8xx_comm.h 1.9 -> 1.10 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/01/13 jejb@raven.il.steeleye.com 1.958 # update drivers using dma_alloc_[non]coherent for GFP_ flags # -------------------------------------------- # diff -Nru a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c --- a/drivers/scsi/53c700.c Mon Jan 13 11:07:37 2003 +++ b/drivers/scsi/53c700.c Mon Jan 13 11:07:37 2003 @@ -246,7 +246,7 @@ int j; memory = dma_alloc_noncoherent(hostdata->dev, TOTAL_MEM_SIZE, - &pScript); + &pScript, GFP_KERNEL); if(memory == NULL) { printk(KERN_ERR "53c700: Failed to allocate memory for driver, detatching\n"); return NULL; diff -Nru a/drivers/scsi/sym53c8xx_comm.h b/drivers/scsi/sym53c8xx_comm.h --- a/drivers/scsi/sym53c8xx_comm.h Mon Jan 13 11:07:37 2003 +++ b/drivers/scsi/sym53c8xx_comm.h Mon Jan 13 11:07:37 2003 @@ -797,7 +797,7 @@ dma_addr_t daddr; vp = (m_addr_t) dma_alloc_coherent(mp->bush, PAGE_SIZE<vaddr = vp;