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

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

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

* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] a fix towards allmodconfig build
  [IA64] use generic_handle_irq()
  [IA64] typename -> name conversion
  [IA64] irqs: use `name' not `typename'
  [IA64] bte_unaligned_copy() transfers one extra cache line.
parents 097b8457 cea196bb

arch/ia64/hp/sim/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ config HP_SIMSERIAL_CONSOLE 
	depends on HP_SIMSERIAL



config HP_SIMSCSI

	tristate "Simulated SCSI disk"

	depends on SCSI

	bool "Simulated SCSI disk"

	depends on SCSI=y



endmenu

arch/ia64/hp/sim/hpsim_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ hpsim_set_affinity_noop (unsigned int a, cpumask_t b) 
}



static struct hw_interrupt_type irq_type_hp_sim = {

	.typename =	"hpsim",

	.name =		"hpsim",

	.startup =	hpsim_irq_startup,

	.shutdown =	hpsim_irq_noop,

	.enable =	hpsim_irq_noop,

arch/ia64/kernel/iosapic.c

+3 −3
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ iosapic_end_level_irq (unsigned int irq) 
#define iosapic_ack_level_irq		nop



struct hw_interrupt_type irq_type_iosapic_level = {

	.typename =	"IO-SAPIC-level",

	.name =		"IO-SAPIC-level",

	.startup =	iosapic_startup_level_irq,

	.shutdown =	iosapic_shutdown_level_irq,

	.enable =	iosapic_enable_level_irq,
@@ -473,7 +473,7 @@ iosapic_ack_edge_irq (unsigned int irq) 
#define iosapic_end_edge_irq		nop



struct hw_interrupt_type irq_type_iosapic_edge = {

	.typename =	"IO-SAPIC-edge",

	.name =		"IO-SAPIC-edge",

	.startup =	iosapic_startup_edge_irq,

	.shutdown =	iosapic_disable_edge_irq,

	.enable =	iosapic_enable_edge_irq,
@@ -664,7 +664,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery, 
			printk(KERN_WARNING

			       "%s: changing vector %d from %s to %s\n",

			       __FUNCTION__, vector,

			       idesc->chip->typename, irq_type->typename);

			       idesc->chip->name, irq_type->name);

		idesc->chip = irq_type;

	}

	return 0;

arch/ia64/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v) 
			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);

		}

#endif

		seq_printf(p, " %14s", irq_desc[i].chip->typename);

		seq_printf(p, " %14s", irq_desc[i].chip->name);

		seq_printf(p, "  %s", action->name);



		for (action=action->next; action; action = action->next)
@@ -197,7 +197,7 @@ void fixup_irqs(void) 
			struct pt_regs *old_regs = set_irq_regs(NULL);



			vectors_in_migration[irq]=0;

			__do_IRQ(irq);

			generic_handle_irq(irq);

			set_irq_regs(old_regs);

		}

	}

arch/ia64/kernel/irq_ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) 
			ia64_setreg(_IA64_REG_CR_TPR, vector);

			ia64_srlz_d();



			__do_IRQ(local_vector_to_irq(vector));

			generic_handle_irq(local_vector_to_irq(vector));



			/*

			 * Disable interrupts and send EOI:
@@ -242,7 +242,7 @@ void ia64_process_pending_intr(void) 
			 * Probably could shared code.

			 */

			vectors_in_migration[local_vector_to_irq(vector)]=0;

			__do_IRQ(local_vector_to_irq(vector));

			generic_handle_irq(local_vector_to_irq(vector));

			set_irq_regs(old_regs);



			/*