diff options
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 7cfe1669ae9d..c829e6a2e8a6 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 | ||
@@ -562,18 +562,18 @@ static int init_shared_mem(struct s2io_nic *nic) | |||
562 | (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); | 562 | (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL); |
563 | if (!ba->ba_0_org) | 563 | if (!ba->ba_0_org) |
564 | return -ENOMEM; | 564 | return -ENOMEM; |
565 | tmp = (u64) ba->ba_0_org; | 565 | tmp = (unsigned long) ba->ba_0_org; |
566 | tmp += ALIGN_SIZE; | 566 | tmp += ALIGN_SIZE; |
567 | tmp &= ~((u64) ALIGN_SIZE); | 567 | tmp &= ~((unsigned long) ALIGN_SIZE); |
568 | ba->ba_0 = (void *) tmp; | 568 | ba->ba_0 = (void *) tmp; |
569 | 569 | ||
570 | ba->ba_1_org = (void *) kmalloc | 570 | ba->ba_1_org = (void *) kmalloc |
571 | (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); | 571 | (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL); |
572 | if (!ba->ba_1_org) | 572 | if (!ba->ba_1_org) |
573 | return -ENOMEM; | 573 | return -ENOMEM; |
574 | tmp = (u64) ba->ba_1_org; | 574 | tmp = (unsigned long) ba->ba_1_org; |
575 | tmp += ALIGN_SIZE; | 575 | tmp += ALIGN_SIZE; |
576 | tmp &= ~((u64) ALIGN_SIZE); | 576 | tmp &= ~((unsigned long) ALIGN_SIZE); |
577 | ba->ba_1 = (void *) tmp; | 577 | ba->ba_1 = (void *) tmp; |
578 | k++; | 578 | k++; |
579 | } | 579 | } |