Commit a5d17928 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] one-line cleanup on set_irq_affinity_info
  [IA64] fix broken irq affinity
  [IA64] sn2 defconfig
parents 0c056c50 4c31ce8f

arch/ia64/configs/sn2_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y 
CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y

CONFIG_NUMA=y

CONFIG_NODES_SHIFT=8

CONFIG_NODES_SHIFT=10

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
@@ -1159,7 +1159,7 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_PREEMPT=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

arch/ia64/kernel/iosapic.c

+2 −2
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ iosapic_end_level_irq (unsigned int irq) 
	ia64_vector vec = irq_to_vector(irq);

	struct iosapic_rte_info *rte;



	move_irq(irq);

	move_native_irq(irq);

	list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list)

		iosapic_eoi(rte->addr, vec);

}
@@ -458,7 +458,7 @@ iosapic_ack_edge_irq (unsigned int irq) 
{

	irq_desc_t *idesc = irq_descp(irq);



	move_irq(irq);

	move_native_irq(irq);

	/*

	 * Once we have recorded IRQ_PENDING already, we can mask the

	 * interrupt for real. This prevents IRQ storms from unhandled

arch/ia64/kernel/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir) 


	if (irq < NR_IRQS) {

		irq_affinity[irq] = mask;

		set_irq_info(irq, mask);

		irq_redir[irq] = (char) (redir & 0xff);

	}

}