From 9de07a2840f98d055fbfdb3df91a1d94ec34e828 Mon Sep 17 00:00:00 2001 From: Dhananjay Phadke Date: Tue, 7 Apr 2009 22:50:48 +0000 Subject: [PATCH] --- yaml --- r: 149707 b: refs/heads/master c: ea7eaa39ffadffaa8f1dd1a1f85fa38bf8ae9d39 h: refs/heads/master i: 149705: a37b6e9dc7beb5b9f512d338d0c6e7ff286ab35e 149703: 9abfe168e06f6f303493ed49a0c5810d0e040a2a v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_hw.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6dee785bc61..85c2b9fc3572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a92e9e65f0068a291a677c627a747fae1f230284 +refs/heads/master: ea7eaa39ffadffaa8f1dd1a1f85fa38bf8ae9d39 diff --git a/trunk/drivers/net/netxen/netxen_nic_hw.c b/trunk/drivers/net/netxen/netxen_nic_hw.c index 9439f89869de..3bb2b8c74d92 100644 --- a/trunk/drivers/net/netxen/netxen_nic_hw.c +++ b/trunk/drivers/net/netxen/netxen_nic_hw.c @@ -89,7 +89,8 @@ static void __iomem *pci_base_offset(struct netxen_adapter *adapter, } #define CRB_WIN_LOCK_TIMEOUT 100000000 -static crb_128M_2M_block_map_t crb_128M_2M_map[64] = { +static crb_128M_2M_block_map_t +crb_128M_2M_map[64] __cacheline_aligned_in_smp = { {{{0, 0, 0, 0} } }, /* 0: PCI */ {{{1, 0x0100000, 0x0102000, 0x120000}, /* 1: PCIE */ {1, 0x0110000, 0x0120000, 0x130000},