aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/s2io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 5dda043bd9d7..7f9a11fc3a18 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -354,7 +354,7 @@ static int init_shared_mem(struct s2io_nic *nic)
354 int lst_size, lst_per_page; 354 int lst_size, lst_per_page;
355 struct net_device *dev = nic->dev; 355 struct net_device *dev = nic->dev;
356#ifdef CONFIG_2BUFF_MODE 356#ifdef CONFIG_2BUFF_MODE
357 u64 tmp; 357 unsigned long tmp;
358 buffAdd_t *ba; 358 buffAdd_t *ba;
359#endif 359#endif
360 360
@@ -542,18 +542,18 @@ static int init_shared_mem(struct s2io_nic *nic)
542 (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); 542 (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
543 if (!ba->ba_0_org) 543 if (!ba->ba_0_org)
544 return -ENOMEM; 544 return -ENOMEM;
545 tmp = (u64) ba->ba_0_org; 545 tmp = (unsigned long) ba->ba_0_org;
546 tmp += ALIGN_SIZE; 546 tmp += ALIGN_SIZE;
547 tmp &= ~((u64) ALIGN_SIZE); 547 tmp &= ~((unsigned long) ALIGN_SIZE);
548 ba->ba_0 = (void *) tmp; 548 ba->ba_0 = (void *) tmp;
549 549
550 ba->ba_1_org = (void *) kmalloc 550 ba->ba_1_org = (void *) kmalloc
551 (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); 551 (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
552 if (!ba->ba_1_org) 552 if (!ba->ba_1_org)
553 return -ENOMEM; 553 return -ENOMEM;
554 tmp = (u64) ba->ba_1_org; 554 tmp = (unsigned long) ba->ba_1_org;
555 tmp += ALIGN_SIZE; 555 tmp += ALIGN_SIZE;
556 tmp &= ~((u64) ALIGN_SIZE); 556 tmp &= ~((unsigned long) ALIGN_SIZE);
557 ba->ba_1 = (void *) tmp; 557 ba->ba_1 = (void *) tmp;
558 k++; 558 k++;
559 } 559 }