|
@@ -1290,7 +1290,7 @@ static int adpt_i2o_post_wait(adpt_hba* pHba, u32* msg, int len, int timeout)
|
|
|
ulong flags = 0;
|
|
|
struct adpt_i2o_post_wait_data *p1, *p2;
|
|
|
struct adpt_i2o_post_wait_data *wait_data =
|
|
|
- kmalloc(sizeof(struct adpt_i2o_post_wait_data),GFP_KERNEL);
|
|
|
+ kmalloc(sizeof(struct adpt_i2o_post_wait_data), GFP_ATOMIC);
|
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
|
|
|
|
if (!wait_data)
|
|
@@ -2651,7 +2651,8 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
|
|
|
pDev = pDev->next_lun;
|
|
|
}
|
|
|
if(!pDev ) { // Something new add it
|
|
|
- d = kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
|
|
|
+ d = kmalloc(sizeof(struct i2o_device),
|
|
|
+ GFP_ATOMIC);
|
|
|
if(d==NULL)
|
|
|
{
|
|
|
printk(KERN_CRIT "Out of memory for I2O device data.\n");
|
|
@@ -2673,7 +2674,9 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
|
|
|
}
|
|
|
pDev = pHba->channel[bus_no].device[scsi_id];
|
|
|
if( pDev == NULL){
|
|
|
- pDev = kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
|
|
|
+ pDev =
|
|
|
+ kzalloc(sizeof(struct adpt_device),
|
|
|
+ GFP_ATOMIC);
|
|
|
if(pDev == NULL) {
|
|
|
return -ENOMEM;
|
|
|
}
|
|
@@ -2682,7 +2685,9 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
|
|
|
while (pDev->next_lun) {
|
|
|
pDev = pDev->next_lun;
|
|
|
}
|
|
|
- pDev = pDev->next_lun = kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
|
|
|
+ pDev = pDev->next_lun =
|
|
|
+ kzalloc(sizeof(struct adpt_device),
|
|
|
+ GFP_ATOMIC);
|
|
|
if(pDev == NULL) {
|
|
|
return -ENOMEM;
|
|
|
}
|
|
@@ -3127,7 +3132,7 @@ static int adpt_i2o_lct_get(adpt_hba* pHba)
|
|
|
if (pHba->lct == NULL) {
|
|
|
pHba->lct = dma_alloc_coherent(&pHba->pDev->dev,
|
|
|
pHba->lct_size, &pHba->lct_pa,
|
|
|
- GFP_KERNEL);
|
|
|
+ GFP_ATOMIC);
|
|
|
if(pHba->lct == NULL) {
|
|
|
printk(KERN_CRIT "%s: Lct Get failed. Out of memory.\n",
|
|
|
pHba->name);
|