OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

This commit is contained in:
David S. Miller 2009-03-27 15:37:57 -07:00
parent bd14ba842c 7c757eb9f8
commit 8ebaebca7e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/kernel/time_64.c
View File

@ -724,12 +724,14 @@ void timer_interrupt(int irq, struct pt_regs *regs)
unsigned long tick_mask = tick_ops->softint_mask;
int cpu = smp_processor_id();
struct clock_event_device *evt = &per_cpu(sparc64_events, cpu);
struct irq_desc *desc;
clear_softint(tick_mask);
irq_enter();
kstat_this_cpu.irqs[0]++;
desc = irq_to_desc(0);
kstat_incr_irqs_this_cpu(0, desc);
if (unlikely(!evt->event_handler)) {
printk(KERN_WARNING

2
drivers/infiniband/hw/nes/nes_nic.c
View File

@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
netdev->features |= NETIF_F_LLTX;
/* Fill in the port structure */
nesvnic->netdev = netdev;