Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ebaebca authored by David S. Miller's avatar David S. Miller
Browse files

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

parents bd14ba84 7c757eb9

arch/sparc/kernel/time_64.c

+3 −1
Original line number Diff line number Diff line
@@ -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

drivers/infiniband/hw/nes/nes_nic.c

+0 −2
Original line number Diff line number Diff line
@@ -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;