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

Commit 0f5c2ac5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-cleanup-for-linus' of... 

Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
  um: Use generic irq Kconfig
  tile: Use generic irq Kconfig
  sparc: Use generic irq Kconfig
  score: Use generic irq Kconfig
  powerpc: Use generic irq Kconfig
  parisc: Use generic irq Kconfig
  mn10300: Use generic irq Kconfig
  microblaze: Use generic irq Kconfig
  m68knommu: Use generic irq Kconfig
  ia64: Use generic irq Kconfig
  frv: Use generic irq Kconfig
  blackfin: Use generic irq Kconfig
  alpha: Use generic irq Kconfig
  genirq: Remove __do_IRQ
  m32r: Convert to generic irq Kconfig
  m32r: Convert usrv platform irq handling
  m32r: Convert opsput_lcdpld irq chip
  m32r: Convert opsput lanpld irq chip
  m32r: Convert opsput pld irq chip
  m32r: Convert opsput irq chip
  ...
parents cfd74486 dfff95c3

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -357,14 +357,6 @@ Who: Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com> 


-----------------------------



What:	__do_IRQ all in one fits nothing interrupt handler

When:	2.6.32

Why:	__do_IRQ was kept for easy migration to the type flow handlers.

	More than two years of migration time is enough.

Who:	Thomas Gleixner <tglx@linutronix.de>



-----------------------------



What:	fakephp and associated sysfs files in /sys/bus/pci/slots/

When:	2011

Why:	In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to

arch/alpha/Kconfig

+3 −16
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ config ALPHA 
	select HAVE_IRQ_WORK

	select HAVE_PERF_EVENTS

	select HAVE_DMA_ATTRS

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select AUTO_IRQ_AFFINITY if SMP

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,
@@ -68,22 +71,6 @@ config GENERIC_IOMAP 
	bool

	default n



config GENERIC_HARDIRQS_NO__DO_IRQ

	def_bool y



config GENERIC_HARDIRQS

	bool

	default y



config GENERIC_IRQ_PROBE

	bool

	default y



config AUTO_IRQ_AFFINITY

	bool

	depends on SMP

	default y



source "init/Kconfig"

source "kernel/Kconfig.freezer"

arch/blackfin/Kconfig

+3 −14
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ config BLACKFIN 
	select HAVE_KERNEL_LZO if RAMKERNEL

	select HAVE_OPROFILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select IRQ_PER_CPU if SMP



config GENERIC_CSUM

	def_bool y
@@ -44,15 +47,6 @@ config ZONE_DMA 
config GENERIC_FIND_NEXT_BIT

	def_bool y



config GENERIC_HARDIRQS

	def_bool y



config GENERIC_IRQ_PROBE

	def_bool y



config GENERIC_HARDIRQS_NO__DO_IRQ

	def_bool y



config GENERIC_GPIO

	def_bool y
@@ -254,11 +248,6 @@ config HOTPLUG_CPU 
	depends on SMP && HOTPLUG

	default y



config IRQ_PER_CPU

	bool

	depends on SMP

	default y



config HAVE_LEGACY_PER_CPU_AREA

	def_bool y

	depends on SMP

arch/cris/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ config CRIS 
	bool

	default y

	select HAVE_IDE

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_HARDIRQS_NO_DEPRECATED



config HZ

	int
@@ -67,10 +69,6 @@ menu "General setup" 


source "fs/Kconfig.binfmt"



config GENERIC_HARDIRQS

	bool

	default y



config ETRAX_CMDLINE

	string "Kernel command line"

	default "root=/dev/mtdblock3"

arch/cris/arch-v10/kernel/irq.c

+10 −31
Original line number Diff line number Diff line
@@ -104,43 +104,21 @@ static void (*interrupt[NR_IRQS])(void) = { 
	IRQ31_interrupt

};



static void enable_crisv10_irq(unsigned int irq);



static unsigned int startup_crisv10_irq(unsigned int irq)

{

	enable_crisv10_irq(irq);

	return 0;

}



#define shutdown_crisv10_irq	disable_crisv10_irq



static void enable_crisv10_irq(unsigned int irq)

{

	crisv10_unmask_irq(irq);

}



static void disable_crisv10_irq(unsigned int irq)

{

	crisv10_mask_irq(irq);

}



static void ack_crisv10_irq(unsigned int irq)

static void enable_crisv10_irq(struct irq_data *data)

{

	crisv10_unmask_irq(data->irq);

}



static void end_crisv10_irq(unsigned int irq)

static void disable_crisv10_irq(struct irq_data *data)

{

	crisv10_mask_irq(data->irq);

}



static struct irq_chip crisv10_irq_type = {

	.name		= "CRISv10",

	.startup =     startup_crisv10_irq,

	.shutdown =    shutdown_crisv10_irq,

	.enable =      enable_crisv10_irq,

	.disable =     disable_crisv10_irq,

	.ack =         ack_crisv10_irq,

	.end =         end_crisv10_irq,

	.set_affinity = NULL

	.irq_shutdown	= disable_crisv10_irq,

	.irq_enable	= enable_crisv10_irq,

	.irq_disable	= disable_crisv10_irq,

};



void weird_irq(void);
@@ -221,7 +199,8 @@ init_IRQ(void) 


	/* Initialize IRQ handler descriptors. */

	for(i = 2; i < NR_IRQS; i++) {

		irq_desc[i].chip = &crisv10_irq_type;

		set_irq_desc_and_handler(i, &crisv10_irq_type,

					 handle_simple_irq);

		set_int_vector(i, interrupt[i]);

	}