From 3ac0ac3773a0deb906559e67c62a994d5add6400 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Wed, 22 Feb 2012 01:39:37 +0000
Subject: [PATCH] --- yaml --- r: 297630 b: refs/heads/master c:
 f8e56c42e4e3527f629682ca123f881c1bea8500 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/Kconfig                        |  2 +-
 trunk/arch/arm/include/asm/hardware/it8152.h  |  3 ---
 trunk/arch/arm/include/asm/irq.h              |  8 ++------
 trunk/arch/arm/include/asm/mc146818rtc.h      |  4 +---
 trunk/arch/arm/kernel/time.c                  |  2 ++
 trunk/arch/arm/mach-highbank/highbank.c       |  1 +
 .../arm/mach-highbank/include/mach/irqs.h     |  6 ++++++
 trunk/arch/arm/mach-mmp/aspenite.c            |  5 ++---
 trunk/arch/arm/mach-mmp/avengers_lite.c       |  1 -
 trunk/arch/arm/mach-mmp/brownstone.c          |  4 ++--
 trunk/arch/arm/mach-mmp/flint.c               |  3 +--
 trunk/arch/arm/mach-mmp/gplugd.c              |  2 +-
 trunk/arch/arm/mach-mmp/include/mach/irqs.h   |  3 ++-
 trunk/arch/arm/mach-mmp/irq-mmp2.c            |  1 -
 trunk/arch/arm/mach-mmp/jasper.c              |  5 ++---
 trunk/arch/arm/mach-mmp/tavorevb.c            |  1 -
 trunk/arch/arm/mach-mmp/teton_bga.c           |  3 +--
 trunk/arch/arm/mach-mmp/ttc_dkb.c             |  4 ++--
 trunk/arch/arm/mach-msm/timer.c               | 12 +++++++++--
 .../arm/mach-picoxcell/include/mach/irqs.h    | 20 +++++++++++++++++++
 trunk/arch/arm/mach-pxa/capc7117.c            |  1 -
 trunk/arch/arm/mach-pxa/cm-x300.c             |  1 -
 trunk/arch/arm/mach-pxa/colibri-pxa270.c      |  2 --
 trunk/arch/arm/mach-pxa/colibri-pxa300.c      |  1 -
 trunk/arch/arm/mach-pxa/colibri-pxa320.c      |  1 -
 trunk/arch/arm/mach-pxa/corgi.c               |  3 ---
 trunk/arch/arm/mach-pxa/csb726.c              |  1 -
 trunk/arch/arm/mach-pxa/devices.c             |  1 -
 trunk/arch/arm/mach-pxa/em-x270.c             |  2 --
 trunk/arch/arm/mach-pxa/gumstix.c             |  1 -
 trunk/arch/arm/mach-pxa/h5000.c               |  1 -
 trunk/arch/arm/mach-pxa/himalaya.c            |  1 -
 trunk/arch/arm/mach-pxa/icontrol.c            |  1 -
 trunk/arch/arm/mach-pxa/idp.c                 |  1 -
 trunk/arch/arm/mach-pxa/include/mach/irqs.h   |  2 +-
 .../arm/mach-pxa/include/mach/mainstone.h     |  2 --
 trunk/arch/arm/mach-pxa/mioa701.c             |  1 -
 trunk/arch/arm/mach-pxa/mp900.c               |  1 -
 trunk/arch/arm/mach-pxa/palmld.c              |  1 -
 trunk/arch/arm/mach-pxa/palmt5.c              |  1 -
 trunk/arch/arm/mach-pxa/palmtc.c              |  1 -
 trunk/arch/arm/mach-pxa/palmte2.c             |  1 -
 trunk/arch/arm/mach-pxa/palmtreo.c            |  2 --
 trunk/arch/arm/mach-pxa/palmtx.c              |  1 -
 trunk/arch/arm/mach-pxa/palmz72.c             |  1 -
 trunk/arch/arm/mach-pxa/pxa3xx.c              |  1 -
 trunk/arch/arm/mach-pxa/raumfeld.c            |  3 ---
 trunk/arch/arm/mach-pxa/saar.c                |  1 -
 trunk/arch/arm/mach-pxa/spitz.c               |  3 ---
 trunk/arch/arm/mach-pxa/stargate2.c           |  1 -
 trunk/arch/arm/mach-pxa/tavorevb.c            |  1 -
 trunk/arch/arm/mach-pxa/time.c                |  1 -
 trunk/arch/arm/mach-pxa/trizeps4.c            |  2 --
 trunk/arch/arm/mach-pxa/viper.c               |  1 -
 trunk/arch/arm/mach-pxa/vpac270.c             |  1 -
 trunk/arch/arm/mach-pxa/xcep.c                |  1 -
 trunk/arch/arm/mach-pxa/z2.c                  |  1 -
 trunk/arch/arm/mach-shmobile/Kconfig          |  4 ----
 trunk/arch/arm/mach-shmobile/board-ag5evm.c   |  1 -
 trunk/arch/arm/mach-shmobile/board-bonito.c   |  1 -
 trunk/arch/arm/mach-shmobile/board-g3evm.c    |  1 -
 trunk/arch/arm/mach-shmobile/board-g4evm.c    |  1 -
 trunk/arch/arm/mach-shmobile/board-kota2.c    |  1 -
 trunk/arch/arm/mach-shmobile/board-mackerel.c |  1 -
 trunk/arch/arm/mach-shmobile/board-marzen.c   |  1 -
 .../arm/mach-shmobile/include/mach/irqs.h     |  6 +++++-
 trunk/arch/arm/mach-shmobile/intc-r8a7740.c   |  1 -
 trunk/arch/arm/mach-shmobile/intc-sh7367.c    |  1 -
 trunk/arch/arm/mach-shmobile/intc-sh7372.c    |  1 -
 trunk/arch/arm/mach-shmobile/intc-sh7377.c    |  1 -
 trunk/arch/arm/mach-shmobile/intc-sh73a0.c    |  1 -
 trunk/arch/arm/mach-shmobile/setup-r8a7740.c  |  1 -
 trunk/arch/arm/mach-shmobile/setup-r8a7779.c  |  1 -
 trunk/arch/arm/mach-shmobile/setup-sh7367.c   |  1 -
 trunk/arch/arm/mach-shmobile/setup-sh7372.c   |  1 -
 trunk/arch/arm/mach-shmobile/setup-sh7377.c   |  1 -
 trunk/arch/arm/mach-shmobile/setup-sh73a0.c   |  1 -
 trunk/arch/c6x/Kconfig                        |  2 +-
 trunk/arch/powerpc/Kconfig                    |  2 +-
 trunk/arch/sh/Kconfig                         |  2 +-
 trunk/arch/sh/include/asm/irq.h               | 11 ++++++++++
 trunk/arch/x86/Kconfig                        |  1 +
 trunk/drivers/gpio/gpio-pxa.c                 |  2 --
 trunk/drivers/sh/intc/balancing.c             |  2 +-
 trunk/drivers/sh/intc/core.c                  |  2 +-
 trunk/drivers/sh/intc/handle.c                |  2 +-
 trunk/drivers/sh/intc/virq.c                  |  2 +-
 trunk/include/linux/sh_intc.h                 | 17 ----------------
 trunk/kernel/irq/Kconfig                      |  5 +++--
 trunk/sound/arm/pxa2xx-ac97-lib.c             |  2 +-
 91 files changed, 86 insertions(+), 135 deletions(-)
 create mode 100644 trunk/arch/arm/mach-highbank/include/mach/irqs.h
 create mode 100644 trunk/arch/arm/mach-picoxcell/include/mach/irqs.h

diff --git a/[refs] b/[refs]
index bae9e8101c90..da2e8065d4d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc38d82676d87a21a0f924cb1728f869412749a9
+refs/heads/master: f8e56c42e4e3527f629682ca123f881c1bea8500
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index befb8f35d6ac..d1fcfe066830 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -28,6 +28,7 @@ config ARM
 	select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
 	select HAVE_C_RECORDMCOUNT
 	select HAVE_GENERIC_HARDIRQS
+	select HAVE_SPARSE_IRQ
 	select GENERIC_IRQ_SHOW
 	select CPU_PM if (SUSPEND || CPU_IDLE)
 	select GENERIC_PCI_IOMAP
@@ -346,7 +347,6 @@ config ARCH_HIGHBANK
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU
 	select HAVE_SMP
-	select SPARSE_IRQ
 	select USE_OF
 	help
 	  Support for the Calxeda Highbank SoC based boards.
diff --git a/trunk/arch/arm/include/asm/hardware/it8152.h b/trunk/arch/arm/include/asm/hardware/it8152.h
index 73f84fa4f366..43cab498bc27 100644
--- a/trunk/arch/arm/include/asm/hardware/it8152.h
+++ b/trunk/arch/arm/include/asm/hardware/it8152.h
@@ -9,9 +9,6 @@
 
 #ifndef __ASM_HARDWARE_IT8152_H
 #define __ASM_HARDWARE_IT8152_H
-
-#include <mach/irqs.h>
-
 extern void __iomem *it8152_base_address;
 
 #define IT8152_IO_BASE			(it8152_base_address + 0x03e00000)
diff --git a/trunk/arch/arm/include/asm/irq.h b/trunk/arch/arm/include/asm/irq.h
index 35c21c375d81..5a526afb5f18 100644
--- a/trunk/arch/arm/include/asm/irq.h
+++ b/trunk/arch/arm/include/asm/irq.h
@@ -1,18 +1,14 @@
 #ifndef __ASM_ARM_IRQ_H
 #define __ASM_ARM_IRQ_H
 
-#define NR_IRQS_LEGACY	16
-
-#ifndef CONFIG_SPARSE_IRQ
 #include <mach/irqs.h>
-#else
-#define NR_IRQS NR_IRQS_LEGACY
-#endif
 
 #ifndef irq_canonicalize
 #define irq_canonicalize(i)	(i)
 #endif
 
+#define NR_IRQS_LEGACY	16
+
 /*
  * Use this value to indicate lack of interrupt
  * capability
diff --git a/trunk/arch/arm/include/asm/mc146818rtc.h b/trunk/arch/arm/include/asm/mc146818rtc.h
index e8567bb99dfc..6b884d2b0b69 100644
--- a/trunk/arch/arm/include/asm/mc146818rtc.h
+++ b/trunk/arch/arm/include/asm/mc146818rtc.h
@@ -5,9 +5,7 @@
 #define _ASM_MC146818RTC_H
 
 #include <linux/io.h>
-#include <linux/kernel.h>
-
-#define RTC_IRQ BUILD_BUG_ON(1)
+#include <mach/irqs.h>
 
 #ifndef RTC_PORT
 #define RTC_PORT(x)	(0x70 + (x))
diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c
index fe31b22f18fd..5bff28839cb2 100644
--- a/trunk/arch/arm/kernel/time.c
+++ b/trunk/arch/arm/kernel/time.c
@@ -25,6 +25,8 @@
 #include <linux/timer.h>
 #include <linux/irq.h>
 
+#include <linux/mc146818rtc.h>
+
 #include <asm/leds.h>
 #include <asm/thread_info.h>
 #include <asm/sched_clock.h>
diff --git a/trunk/arch/arm/mach-highbank/highbank.c b/trunk/arch/arm/mach-highbank/highbank.c
index ee228ef3d27d..7afbe1e55beb 100644
--- a/trunk/arch/arm/mach-highbank/highbank.c
+++ b/trunk/arch/arm/mach-highbank/highbank.c
@@ -33,6 +33,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
+#include <mach/irqs.h>
 
 #include "core.h"
 #include "sysregs.h"
diff --git a/trunk/arch/arm/mach-highbank/include/mach/irqs.h b/trunk/arch/arm/mach-highbank/include/mach/irqs.h
new file mode 100644
index 000000000000..9746aab14e9a
--- /dev/null
+++ b/trunk/arch/arm/mach-highbank/include/mach/irqs.h
@@ -0,0 +1,6 @@
+#ifndef __MACH_IRQS_H
+#define __MACH_IRQS_H
+
+#define NR_IRQS			192
+
+#endif
diff --git a/trunk/arch/arm/mach-mmp/aspenite.c b/trunk/arch/arm/mach-mmp/aspenite.c
index 5483d6f5c6d7..17cb76060125 100644
--- a/trunk/arch/arm/mach-mmp/aspenite.c
+++ b/trunk/arch/arm/mach-mmp/aspenite.c
@@ -24,7 +24,6 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa168.h>
 #include <mach/pxa168.h>
-#include <mach/irqs.h>
 #include <video/pxa168fb.h>
 #include <linux/input.h>
 #include <plat/pxa27x_keypad.h>
@@ -241,7 +240,7 @@ static void __init common_init(void)
 
 MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= MMP_NR_IRQS,
+	.nr_irqs	= IRQ_BOARD_START,
 	.init_irq       = pxa168_init_irq,
 	.timer          = &pxa168_timer,
 	.init_machine   = common_init,
@@ -250,7 +249,7 @@ MACHINE_END
 
 MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= MMP_NR_IRQS,
+	.nr_irqs	= IRQ_BOARD_START,
 	.init_irq       = pxa168_init_irq,
 	.timer          = &pxa168_timer,
 	.init_machine   = common_init,
diff --git a/trunk/arch/arm/mach-mmp/avengers_lite.c b/trunk/arch/arm/mach-mmp/avengers_lite.c
index 603542ae6fbd..b148a9dc5a44 100644
--- a/trunk/arch/arm/mach-mmp/avengers_lite.c
+++ b/trunk/arch/arm/mach-mmp/avengers_lite.c
@@ -43,7 +43,6 @@ static void __init avengers_lite_init(void)
 
 MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= MMP_NR_IRQS,
 	.init_irq       = pxa168_init_irq,
 	.timer          = &pxa168_timer,
 	.init_machine   = avengers_lite_init,
diff --git a/trunk/arch/arm/mach-mmp/brownstone.c b/trunk/arch/arm/mach-mmp/brownstone.c
index 5cb769cd26d9..d839fe6421e6 100644
--- a/trunk/arch/arm/mach-mmp/brownstone.c
+++ b/trunk/arch/arm/mach-mmp/brownstone.c
@@ -28,7 +28,7 @@
 
 #include "common.h"
 
-#define BROWNSTONE_NR_IRQS	(MMP_NR_IRQS + 40)
+#define BROWNSTONE_NR_IRQS	(IRQ_BOARD_START + 40)
 
 #define GPIO_5V_ENABLE		(89)
 
@@ -158,7 +158,7 @@ static struct platform_device brownstone_v_5vp_device = {
 };
 
 static struct max8925_platform_data brownstone_max8925_info = {
-	.irq_base		= MMP_NR_IRQS,
+	.irq_base		= IRQ_BOARD_START,
 };
 
 static struct i2c_board_info brownstone_twsi1_info[] = {
diff --git a/trunk/arch/arm/mach-mmp/flint.c b/trunk/arch/arm/mach-mmp/flint.c
index 8059cc0905c6..2ee8cd7829dd 100644
--- a/trunk/arch/arm/mach-mmp/flint.c
+++ b/trunk/arch/arm/mach-mmp/flint.c
@@ -23,11 +23,10 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-mmp2.h>
 #include <mach/mmp2.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
-#define FLINT_NR_IRQS	(MMP_NR_IRQS + 48)
+#define FLINT_NR_IRQS	(IRQ_BOARD_START + 48)
 
 static unsigned long flint_pin_config[] __initdata = {
 	/* UART1 */
diff --git a/trunk/arch/arm/mach-mmp/gplugd.c b/trunk/arch/arm/mach-mmp/gplugd.c
index f516e74ce0d5..87765467de63 100644
--- a/trunk/arch/arm/mach-mmp/gplugd.c
+++ b/trunk/arch/arm/mach-mmp/gplugd.c
@@ -191,7 +191,7 @@ static void __init gplugd_init(void)
 
 MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= MMP_NR_IRQS,
+	.nr_irqs	= IRQ_BOARD_START,
 	.init_irq       = pxa168_init_irq,
 	.timer          = &pxa168_timer,
 	.init_machine   = gplugd_init,
diff --git a/trunk/arch/arm/mach-mmp/include/mach/irqs.h b/trunk/arch/arm/mach-mmp/include/mach/irqs.h
index d0e746626a3d..34635a0bbb59 100644
--- a/trunk/arch/arm/mach-mmp/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-mmp/include/mach/irqs.h
@@ -223,6 +223,7 @@
 #define MMP_GPIO_TO_IRQ(gpio)		(IRQ_GPIO_START + (gpio))
 
 #define IRQ_BOARD_START			(IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO)
-#define MMP_NR_IRQS			IRQ_BOARD_START
+
+#define NR_IRQS				(IRQ_BOARD_START)
 
 #endif /* __ASM_MACH_IRQS_H */
diff --git a/trunk/arch/arm/mach-mmp/irq-mmp2.c b/trunk/arch/arm/mach-mmp/irq-mmp2.c
index 7895d277421e..d21c5441a3d0 100644
--- a/trunk/arch/arm/mach-mmp/irq-mmp2.c
+++ b/trunk/arch/arm/mach-mmp/irq-mmp2.c
@@ -15,7 +15,6 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 
-#include <mach/irqs.h>
 #include <mach/regs-icu.h>
 #include <mach/mmp2.h>
 
diff --git a/trunk/arch/arm/mach-mmp/jasper.c b/trunk/arch/arm/mach-mmp/jasper.c
index ff73249884d0..96cf5c8fe47d 100644
--- a/trunk/arch/arm/mach-mmp/jasper.c
+++ b/trunk/arch/arm/mach-mmp/jasper.c
@@ -19,7 +19,6 @@
 #include <linux/mfd/max8925.h>
 #include <linux/interrupt.h>
 
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/addr-map.h>
@@ -28,7 +27,7 @@
 
 #include "common.h"
 
-#define JASPER_NR_IRQS		(MMP_NR_IRQS + 48)
+#define JASPER_NR_IRQS		(IRQ_BOARD_START + 48)
 
 static unsigned long jasper_pin_config[] __initdata = {
 	/* UART1 */
@@ -136,7 +135,7 @@ static struct max8925_power_pdata jasper_power_data = {
 static struct max8925_platform_data jasper_max8925_info = {
 	.backlight		= &jasper_backlight_data,
 	.power			= &jasper_power_data,
-	.irq_base		= MMP_NR_IRQS,
+	.irq_base		= IRQ_BOARD_START,
 };
 
 static struct i2c_board_info jasper_twsi1_info[] = {
diff --git a/trunk/arch/arm/mach-mmp/tavorevb.c b/trunk/arch/arm/mach-mmp/tavorevb.c
index 507e6c0e34f5..8e3b5af04a57 100644
--- a/trunk/arch/arm/mach-mmp/tavorevb.c
+++ b/trunk/arch/arm/mach-mmp/tavorevb.c
@@ -102,7 +102,6 @@ static void __init tavorevb_init(void)
 
 MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= MMP_NR_IRQS,
 	.init_irq       = pxa910_init_irq,
 	.timer          = &pxa910_timer,
 	.init_machine   = tavorevb_init,
diff --git a/trunk/arch/arm/mach-mmp/teton_bga.c b/trunk/arch/arm/mach-mmp/teton_bga.c
index 42bef6674ecf..0523e422990e 100644
--- a/trunk/arch/arm/mach-mmp/teton_bga.c
+++ b/trunk/arch/arm/mach-mmp/teton_bga.c
@@ -26,7 +26,6 @@
 #include <mach/mfp-pxa168.h>
 #include <mach/pxa168.h>
 #include <mach/teton_bga.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
@@ -84,7 +83,7 @@ static void __init teton_bga_init(void)
 
 MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
 	.map_io		= mmp_map_io,
-	.nr_irqs	= MMP_NR_IRQS,
+	.nr_irqs	= IRQ_BOARD_START,
 	.init_irq       = pxa168_init_irq,
 	.timer          = &pxa168_timer,
 	.init_machine   = teton_bga_init,
diff --git a/trunk/arch/arm/mach-mmp/ttc_dkb.c b/trunk/arch/arm/mach-mmp/ttc_dkb.c
index 4c5fd5bb0c9c..5ac5d5832e45 100644
--- a/trunk/arch/arm/mach-mmp/ttc_dkb.c
+++ b/trunk/arch/arm/mach-mmp/ttc_dkb.c
@@ -38,7 +38,7 @@
  * 16 board interrupts -- PCA9575 GPIO expander
  * 24 board interrupts -- 88PM860x PMIC
  */
-#define TTCDKB_NR_IRQS		(MMP_NR_IRQS + 16 + 16 + 24)
+#define TTCDKB_NR_IRQS		(IRQ_BOARD_START + 16 + 16 + 24)
 
 static unsigned long ttc_dkb_pin_config[] __initdata = {
 	/* UART2 */
@@ -130,7 +130,7 @@ static struct platform_device *ttc_dkb_devices[] = {
 static struct pca953x_platform_data max7312_data[] = {
 	{
 		.gpio_base	= TTCDKB_GPIO_EXT0(0),
-		.irq_base	= MMP_NR_IRQS,
+		.irq_base	= IRQ_BOARD_START,
 	},
 };
 
diff --git a/trunk/arch/arm/mach-msm/timer.c b/trunk/arch/arm/mach-msm/timer.c
index 11d0d8f2656c..61983daa7bba 100644
--- a/trunk/arch/arm/mach-msm/timer.c
+++ b/trunk/arch/arm/mach-msm/timer.c
@@ -24,6 +24,7 @@
 #include <asm/mach/time.h>
 #include <asm/hardware/gic.h>
 #include <asm/localtimer.h>
+#include <asm/sched_clock.h>
 
 #include <mach/msm_iomap.h>
 #include <mach/cpu.h>
@@ -105,12 +106,12 @@ static union {
 
 static void __iomem *source_base;
 
-static cycle_t msm_read_timer_count(struct clocksource *cs)
+static notrace cycle_t msm_read_timer_count(struct clocksource *cs)
 {
 	return readl_relaxed(source_base + TIMER_COUNT_VAL);
 }
 
-static cycle_t msm_read_timer_count_shift(struct clocksource *cs)
+static notrace cycle_t msm_read_timer_count_shift(struct clocksource *cs)
 {
 	/*
 	 * Shift timer count down by a constant due to unreliable lower bits
@@ -127,6 +128,11 @@ static struct clocksource msm_clocksource = {
 	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static notrace u32 msm_sched_clock_read(void)
+{
+	return msm_clocksource.read(&msm_clocksource);
+}
+
 static void __init msm_timer_init(void)
 {
 	struct clock_event_device *ce = &msm_clockevent;
@@ -189,6 +195,8 @@ static void __init msm_timer_init(void)
 	res = clocksource_register_hz(cs, dgt_hz);
 	if (res)
 		pr_err("clocksource_register failed\n");
+	setup_sched_clock(msm_sched_clock_read,
+			cpu_is_msm7x01() ? 32 - MSM_DGT_SHIFT : 32, dgt_hz);
 }
 
 #ifdef CONFIG_LOCAL_TIMERS
diff --git a/trunk/arch/arm/mach-picoxcell/include/mach/irqs.h b/trunk/arch/arm/mach-picoxcell/include/mach/irqs.h
new file mode 100644
index 000000000000..59eac1ee2820
--- /dev/null
+++ b/trunk/arch/arm/mach-picoxcell/include/mach/irqs.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2011 Picochip Ltd., Jamie Iles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __MACH_IRQS_H
+#define __MACH_IRQS_H
+
+/* We dynamically allocate our irq_desc's. */
+#define NR_IRQS				0
+
+#endif /* __MACH_IRQS_H */
diff --git a/trunk/arch/arm/mach-pxa/capc7117.c b/trunk/arch/arm/mach-pxa/capc7117.c
index 9a8760b72913..c91727d1fe09 100644
--- a/trunk/arch/arm/mach-pxa/capc7117.c
+++ b/trunk/arch/arm/mach-pxa/capc7117.c
@@ -150,7 +150,6 @@ MACHINE_START(CAPC7117,
 	      "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM")
 	.atag_offset = 0x100,
 	.map_io = pxa3xx_map_io,
-	.nr_irqs = PXA_NR_IRQS,
 	.init_irq = pxa3xx_init_irq,
 	.handle_irq = pxa3xx_handle_irq,
 	.timer = &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/cm-x300.c b/trunk/arch/arm/mach-pxa/cm-x300.c
index 133cceefd2a3..4b981b82d2a5 100644
--- a/trunk/arch/arm/mach-pxa/cm-x300.c
+++ b/trunk/arch/arm/mach-pxa/cm-x300.c
@@ -853,7 +853,6 @@ static void __init cm_x300_fixup(struct tag *tags, char **cmdline,
 MACHINE_START(CM_X300, "CM-X300 module")
 	.atag_offset	= 0x100,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa270.c b/trunk/arch/arm/mach-pxa/colibri-pxa270.c
index b2f227d36125..29d5d541f602 100644
--- a/trunk/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/trunk/arch/arm/mach-pxa/colibri-pxa270.c
@@ -310,7 +310,6 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270")
 	.atag_offset	= 0x100,
 	.init_machine	= colibri_pxa270_init,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
@@ -321,7 +320,6 @@ MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")
 	.atag_offset	= 0x100,
 	.init_machine	= colibri_pxa270_income_init,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa300.c b/trunk/arch/arm/mach-pxa/colibri-pxa300.c
index bb6def8ec979..0846d210cb05 100644
--- a/trunk/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/trunk/arch/arm/mach-pxa/colibri-pxa300.c
@@ -186,7 +186,6 @@ MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
 	.atag_offset	= 0x100,
 	.init_machine	= colibri_pxa300_init,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa320.c b/trunk/arch/arm/mach-pxa/colibri-pxa320.c
index d88e7b37f1da..6ad3359063af 100644
--- a/trunk/arch/arm/mach-pxa/colibri-pxa320.c
+++ b/trunk/arch/arm/mach-pxa/colibri-pxa320.c
@@ -256,7 +256,6 @@ MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
 	.atag_offset	= 0x100,
 	.init_machine	= colibri_pxa320_init,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/corgi.c b/trunk/arch/arm/mach-pxa/corgi.c
index 039aafa455c7..11f1e735966e 100644
--- a/trunk/arch/arm/mach-pxa/corgi.c
+++ b/trunk/arch/arm/mach-pxa/corgi.c
@@ -730,7 +730,6 @@ static void __init fixup_corgi(struct tag *tags, char **cmdline,
 MACHINE_START(CORGI, "SHARP Corgi")
 	.fixup		= fixup_corgi,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.init_machine	= corgi_init,
@@ -743,7 +742,6 @@ MACHINE_END
 MACHINE_START(SHEPHERD, "SHARP Shepherd")
 	.fixup		= fixup_corgi,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.init_machine	= corgi_init,
@@ -756,7 +754,6 @@ MACHINE_END
 MACHINE_START(HUSKY, "SHARP Husky")
 	.fixup		= fixup_corgi,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.init_machine	= corgi_init,
diff --git a/trunk/arch/arm/mach-pxa/csb726.c b/trunk/arch/arm/mach-pxa/csb726.c
index 67f0de37f46e..fb5a51d834e5 100644
--- a/trunk/arch/arm/mach-pxa/csb726.c
+++ b/trunk/arch/arm/mach-pxa/csb726.c
@@ -274,7 +274,6 @@ static void __init csb726_init(void)
 MACHINE_START(CSB726, "Cogent CSB726")
 	.atag_offset	= 0x100,
 	.map_io         = pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq       = pxa27x_init_irq,
 	.handle_irq       = pxa27x_handle_irq,
 	.init_machine   = csb726_init,
diff --git a/trunk/arch/arm/mach-pxa/devices.c b/trunk/arch/arm/mach-pxa/devices.c
index 72a15a62ab02..18fd177073f4 100644
--- a/trunk/arch/arm/mach-pxa/devices.c
+++ b/trunk/arch/arm/mach-pxa/devices.c
@@ -12,7 +12,6 @@
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <mach/irda.h>
-#include <mach/irqs.h>
 #include <mach/ohci.h>
 #include <plat/pxa27x_keypad.h>
 #include <mach/camera.h>
diff --git a/trunk/arch/arm/mach-pxa/em-x270.c b/trunk/arch/arm/mach-pxa/em-x270.c
index c1b65da26335..d80c0ba9a095 100644
--- a/trunk/arch/arm/mach-pxa/em-x270.c
+++ b/trunk/arch/arm/mach-pxa/em-x270.c
@@ -1301,7 +1301,6 @@ static void __init em_x270_init(void)
 MACHINE_START(EM_X270, "Compulab EM-X270")
 	.atag_offset	= 0x100,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
@@ -1312,7 +1311,6 @@ MACHINE_END
 MACHINE_START(EXEDA, "Compulab eXeda")
 	.atag_offset	= 0x100,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/gumstix.c b/trunk/arch/arm/mach-pxa/gumstix.c
index e529a35a44ce..ac3b1cef4751 100644
--- a/trunk/arch/arm/mach-pxa/gumstix.c
+++ b/trunk/arch/arm/mach-pxa/gumstix.c
@@ -235,7 +235,6 @@ static void __init gumstix_init(void)
 MACHINE_START(GUMSTIX, "Gumstix")
 	.atag_offset	= 0x100, /* match u-boot bi_boot_params */
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/h5000.c b/trunk/arch/arm/mach-pxa/h5000.c
index e7dec589f014..fde6b4c873c4 100644
--- a/trunk/arch/arm/mach-pxa/h5000.c
+++ b/trunk/arch/arm/mach-pxa/h5000.c
@@ -205,7 +205,6 @@ static void __init h5000_init(void)
 MACHINE_START(H5400, "HP iPAQ H5000")
 	.atag_offset = 0x100,
 	.map_io = pxa25x_map_io,
-	.nr_irqs = PXA_NR_IRQS,
 	.init_irq = pxa25x_init_irq,
 	.handle_irq = pxa25x_handle_irq,
 	.timer = &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/himalaya.c b/trunk/arch/arm/mach-pxa/himalaya.c
index 2962de898da9..26d069a9f900 100644
--- a/trunk/arch/arm/mach-pxa/himalaya.c
+++ b/trunk/arch/arm/mach-pxa/himalaya.c
@@ -160,7 +160,6 @@ static void __init himalaya_init(void)
 MACHINE_START(HIMALAYA, "HTC Himalaya")
 	.atag_offset = 0x100,
 	.map_io = pxa25x_map_io,
-	.nr_irqs = PXA_NR_IRQS,
 	.init_irq = pxa25x_init_irq,
 	.handle_irq = pxa25x_handle_irq,
 	.init_machine = himalaya_init,
diff --git a/trunk/arch/arm/mach-pxa/icontrol.c b/trunk/arch/arm/mach-pxa/icontrol.c
index 1d02eabc9c65..67400192ed3b 100644
--- a/trunk/arch/arm/mach-pxa/icontrol.c
+++ b/trunk/arch/arm/mach-pxa/icontrol.c
@@ -193,7 +193,6 @@ static void __init icontrol_init(void)
 MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
 	.atag_offset	= 0x100,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/idp.c b/trunk/arch/arm/mach-pxa/idp.c
index 6ff466bd43e8..8af1840e12cc 100644
--- a/trunk/arch/arm/mach-pxa/idp.c
+++ b/trunk/arch/arm/mach-pxa/idp.c
@@ -195,7 +195,6 @@ static void __init idp_map_io(void)
 MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
 	/* Maintainer: Vibren Technologies */
 	.map_io		= idp_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/include/mach/irqs.h b/trunk/arch/arm/mach-pxa/include/mach/irqs.h
index 8765782dd955..32975adf3ca4 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/irqs.h
@@ -100,7 +100,7 @@
  */
 #define IRQ_BOARD_START		(PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO)
 
-#define PXA_NR_IRQS		(IRQ_BOARD_START)
+#define NR_IRQS			(IRQ_BOARD_START)
 
 #ifndef __ASSEMBLY__
 struct irq_data;
diff --git a/trunk/arch/arm/mach-pxa/include/mach/mainstone.h b/trunk/arch/arm/mach-pxa/include/mach/mainstone.h
index 1bfc4e822a41..4c2d11cd824d 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/mainstone.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/mainstone.h
@@ -13,8 +13,6 @@
 #ifndef ASM_ARCH_MAINSTONE_H
 #define ASM_ARCH_MAINSTONE_H
 
-#include <mach/irqs.h>
-
 #define MST_ETH_PHYS		PXA_CS4_PHYS
 
 #define MST_FPGA_PHYS		PXA_CS2_PHYS
diff --git a/trunk/arch/arm/mach-pxa/mioa701.c b/trunk/arch/arm/mach-pxa/mioa701.c
index 061d57009cee..e80a3db735c2 100644
--- a/trunk/arch/arm/mach-pxa/mioa701.c
+++ b/trunk/arch/arm/mach-pxa/mioa701.c
@@ -758,7 +758,6 @@ MACHINE_START(MIOA701, "MIO A701")
 	.atag_offset	= 0x100,
 	.restart_mode	= 's',
 	.map_io		= &pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= &pxa27x_init_irq,
 	.handle_irq	= &pxa27x_handle_irq,
 	.init_machine	= mioa701_machine_init,
diff --git a/trunk/arch/arm/mach-pxa/mp900.c b/trunk/arch/arm/mach-pxa/mp900.c
index 152efbf093f6..169bf8f97af0 100644
--- a/trunk/arch/arm/mach-pxa/mp900.c
+++ b/trunk/arch/arm/mach-pxa/mp900.c
@@ -95,7 +95,6 @@ MACHINE_START(NEC_MP900, "MobilePro900/C")
 	.atag_offset	= 0x220100,
 	.timer		= &pxa_timer,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.init_machine	= mp900c_init,
diff --git a/trunk/arch/arm/mach-pxa/palmld.c b/trunk/arch/arm/mach-pxa/palmld.c
index 31e0433d83ba..1fa80f4f80c8 100644
--- a/trunk/arch/arm/mach-pxa/palmld.c
+++ b/trunk/arch/arm/mach-pxa/palmld.c
@@ -344,7 +344,6 @@ static void __init palmld_init(void)
 MACHINE_START(PALMLD, "Palm LifeDrive")
 	.atag_offset	= 0x100,
 	.map_io		= palmld_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/palmt5.c b/trunk/arch/arm/mach-pxa/palmt5.c
index 0f6bd4fcfa3b..5ba14316bd9c 100644
--- a/trunk/arch/arm/mach-pxa/palmt5.c
+++ b/trunk/arch/arm/mach-pxa/palmt5.c
@@ -205,7 +205,6 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5")
 	.atag_offset	= 0x100,
 	.map_io		= pxa27x_map_io,
 	.reserve	= palmt5_reserve,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/palmtc.c b/trunk/arch/arm/mach-pxa/palmtc.c
index e2d97eed07a7..29b51b40f09d 100644
--- a/trunk/arch/arm/mach-pxa/palmtc.c
+++ b/trunk/arch/arm/mach-pxa/palmtc.c
@@ -539,7 +539,6 @@ static void __init palmtc_init(void)
 MACHINE_START(PALMTC, "Palm Tungsten|C")
 	.atag_offset 	= 0x100,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/palmte2.c b/trunk/arch/arm/mach-pxa/palmte2.c
index c054827c567f..5ebf49acb827 100644
--- a/trunk/arch/arm/mach-pxa/palmte2.c
+++ b/trunk/arch/arm/mach-pxa/palmte2.c
@@ -358,7 +358,6 @@ static void __init palmte2_init(void)
 MACHINE_START(PALMTE2, "Palm Tungsten|E2")
 	.atag_offset	= 0x100,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/palmtreo.c b/trunk/arch/arm/mach-pxa/palmtreo.c
index fbdebee39a53..ec8249156c08 100644
--- a/trunk/arch/arm/mach-pxa/palmtreo.c
+++ b/trunk/arch/arm/mach-pxa/palmtreo.c
@@ -448,7 +448,6 @@ MACHINE_START(TREO680, "Palm Treo 680")
 	.atag_offset    = 0x100,
 	.map_io         = pxa27x_map_io,
 	.reserve	= treo_reserve,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq       = pxa27x_init_irq,
 	.handle_irq       = pxa27x_handle_irq,
 	.timer          = &pxa_timer,
@@ -462,7 +461,6 @@ MACHINE_START(CENTRO, "Palm Centro 685")
 	.atag_offset    = 0x100,
 	.map_io         = pxa27x_map_io,
 	.reserve	= treo_reserve,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq       = pxa27x_init_irq,
 	.handle_irq       = pxa27x_handle_irq,
 	.timer          = &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/palmtx.c b/trunk/arch/arm/mach-pxa/palmtx.c
index 9507605ed547..6170d76dfba8 100644
--- a/trunk/arch/arm/mach-pxa/palmtx.c
+++ b/trunk/arch/arm/mach-pxa/palmtx.c
@@ -366,7 +366,6 @@ static void __init palmtx_init(void)
 MACHINE_START(PALMTX, "Palm T|X")
 	.atag_offset	= 0x100,
 	.map_io		= palmtx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/palmz72.c b/trunk/arch/arm/mach-pxa/palmz72.c
index a97b59965bb9..b2dff9d415eb 100644
--- a/trunk/arch/arm/mach-pxa/palmz72.c
+++ b/trunk/arch/arm/mach-pxa/palmz72.c
@@ -401,7 +401,6 @@ static void __init palmz72_init(void)
 MACHINE_START(PALMZ72, "Palm Zire72")
 	.atag_offset	= 0x100,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/pxa3xx.c b/trunk/arch/arm/mach-pxa/pxa3xx.c
index d2e562d62cf4..f107c71c7589 100644
--- a/trunk/arch/arm/mach-pxa/pxa3xx.c
+++ b/trunk/arch/arm/mach-pxa/pxa3xx.c
@@ -31,7 +31,6 @@
 #include <mach/pm.h>
 #include <mach/dma.h>
 #include <mach/smemc.h>
-#include <mach/irqs.h>
 
 #include "generic.h"
 #include "devices.h"
diff --git a/trunk/arch/arm/mach-pxa/raumfeld.c b/trunk/arch/arm/mach-pxa/raumfeld.c
index 7d691e51cb54..22818c7694a8 100644
--- a/trunk/arch/arm/mach-pxa/raumfeld.c
+++ b/trunk/arch/arm/mach-pxa/raumfeld.c
@@ -1090,7 +1090,6 @@ MACHINE_START(RAUMFELD_RC, "Raumfeld Controller")
 	.atag_offset	= 0x100,
 	.init_machine	= raumfeld_controller_init,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
@@ -1103,7 +1102,6 @@ MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector")
 	.atag_offset	= 0x100,
 	.init_machine	= raumfeld_connector_init,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
@@ -1116,7 +1114,6 @@ MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker")
 	.atag_offset	= 0x100,
 	.init_machine	= raumfeld_speaker_init,
 	.map_io		= pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa3xx_init_irq,
 	.handle_irq	= pxa3xx_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/saar.c b/trunk/arch/arm/mach-pxa/saar.c
index 86c95a5d8533..0fe354efb931 100644
--- a/trunk/arch/arm/mach-pxa/saar.c
+++ b/trunk/arch/arm/mach-pxa/saar.c
@@ -598,7 +598,6 @@ MACHINE_START(SAAR, "PXA930 Handheld Platform (aka SAAR)")
 	/* Maintainer: Eric Miao <eric.miao@marvell.com> */
 	.atag_offset    = 0x100,
 	.map_io         = pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq       = pxa3xx_init_irq,
 	.handle_irq       = pxa3xx_handle_irq,
 	.timer          = &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/spitz.c b/trunk/arch/arm/mach-pxa/spitz.c
index df2ab0fb2ace..abf355d0c92f 100644
--- a/trunk/arch/arm/mach-pxa/spitz.c
+++ b/trunk/arch/arm/mach-pxa/spitz.c
@@ -984,7 +984,6 @@ MACHINE_START(SPITZ, "SHARP Spitz")
 	.restart_mode	= 'g',
 	.fixup		= spitz_fixup,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.init_machine	= spitz_init,
@@ -998,7 +997,6 @@ MACHINE_START(BORZOI, "SHARP Borzoi")
 	.restart_mode	= 'g',
 	.fixup		= spitz_fixup,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.init_machine	= spitz_init,
@@ -1012,7 +1010,6 @@ MACHINE_START(AKITA, "SHARP Akita")
 	.restart_mode	= 'g',
 	.fixup		= spitz_fixup,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.init_machine	= spitz_init,
diff --git a/trunk/arch/arm/mach-pxa/stargate2.c b/trunk/arch/arm/mach-pxa/stargate2.c
index adb601a3762f..b0656e158d90 100644
--- a/trunk/arch/arm/mach-pxa/stargate2.c
+++ b/trunk/arch/arm/mach-pxa/stargate2.c
@@ -1006,7 +1006,6 @@ static void __init stargate2_init(void)
 #ifdef CONFIG_MACH_INTELMOTE2
 MACHINE_START(INTELMOTE2, "IMOTE 2")
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/tavorevb.c b/trunk/arch/arm/mach-pxa/tavorevb.c
index 736bfdc50ee6..9fb38e80e076 100644
--- a/trunk/arch/arm/mach-pxa/tavorevb.c
+++ b/trunk/arch/arm/mach-pxa/tavorevb.c
@@ -491,7 +491,6 @@ MACHINE_START(TAVOREVB, "PXA930 Evaluation Board (aka TavorEVB)")
 	/* Maintainer: Eric Miao <eric.miao@marvell.com> */
 	.atag_offset    = 0x100,
 	.map_io         = pxa3xx_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq       = pxa3xx_init_irq,
 	.handle_irq       = pxa3xx_handle_irq,
 	.timer          = &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/time.c b/trunk/arch/arm/mach-pxa/time.c
index 3d6c9bd90de6..b503049d6d26 100644
--- a/trunk/arch/arm/mach-pxa/time.c
+++ b/trunk/arch/arm/mach-pxa/time.c
@@ -22,7 +22,6 @@
 #include <asm/mach/time.h>
 #include <asm/sched_clock.h>
 #include <mach/regs-ost.h>
-#include <mach/irqs.h>
 
 /*
  * This is PXA's sched_clock implementation. This has a resolution
diff --git a/trunk/arch/arm/mach-pxa/trizeps4.c b/trunk/arch/arm/mach-pxa/trizeps4.c
index 2b6ac00b2cd9..0f30af617d8f 100644
--- a/trunk/arch/arm/mach-pxa/trizeps4.c
+++ b/trunk/arch/arm/mach-pxa/trizeps4.c
@@ -558,7 +558,6 @@ MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")
 	.atag_offset	= 0x100,
 	.init_machine	= trizeps4_init,
 	.map_io		= trizeps4_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
@@ -570,7 +569,6 @@ MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module")
 	.atag_offset	= 0x100,
 	.init_machine	= trizeps4_init,
 	.map_io		= trizeps4_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/viper.c b/trunk/arch/arm/mach-pxa/viper.c
index 3143c3910c7d..023d6ca789de 100644
--- a/trunk/arch/arm/mach-pxa/viper.c
+++ b/trunk/arch/arm/mach-pxa/viper.c
@@ -994,7 +994,6 @@ MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC")
 	/* Maintainer: Marc Zyngier <maz@misterjones.org> */
 	.atag_offset	= 0x100,
 	.map_io		= viper_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= viper_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.timer          = &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/vpac270.c b/trunk/arch/arm/mach-pxa/vpac270.c
index c57ab636ea9c..1f5cfa96f6d6 100644
--- a/trunk/arch/arm/mach-pxa/vpac270.c
+++ b/trunk/arch/arm/mach-pxa/vpac270.c
@@ -718,7 +718,6 @@ static void __init vpac270_init(void)
 MACHINE_START(VPAC270, "Voipac PXA270")
 	.atag_offset	= 0x100,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/xcep.c b/trunk/arch/arm/mach-pxa/xcep.c
index 4275713ccd10..4bbe9a36fe74 100644
--- a/trunk/arch/arm/mach-pxa/xcep.c
+++ b/trunk/arch/arm/mach-pxa/xcep.c
@@ -182,7 +182,6 @@ MACHINE_START(XCEP, "Iskratel XCEP")
 	.atag_offset	= 0x100,
 	.init_machine	= xcep_init,
 	.map_io		= pxa25x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa25x_init_irq,
 	.handle_irq	= pxa25x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-pxa/z2.c b/trunk/arch/arm/mach-pxa/z2.c
index fa8619970841..b6476848b561 100644
--- a/trunk/arch/arm/mach-pxa/z2.c
+++ b/trunk/arch/arm/mach-pxa/z2.c
@@ -721,7 +721,6 @@ static void __init z2_init(void)
 MACHINE_START(ZIPIT2, "Zipit Z2")
 	.atag_offset	= 0x100,
 	.map_io		= pxa27x_map_io,
-	.nr_irqs	= PXA_NR_IRQS,
 	.init_irq	= pxa27x_init_irq,
 	.handle_irq	= pxa27x_handle_irq,
 	.timer		= &pxa_timer,
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
index 34560cab45d9..060e5644c49c 100644
--- a/trunk/arch/arm/mach-shmobile/Kconfig
+++ b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -100,10 +100,6 @@ config MACH_MARZEN
 
 comment "SH-Mobile System Configuration"
 
-config CPU_HAS_INTEVT
-        bool
-	default y
-
 menu "Memory configuration"
 
 config MEMORY_START
diff --git a/trunk/arch/arm/mach-shmobile/board-ag5evm.c b/trunk/arch/arm/mach-shmobile/board-ag5evm.c
index e922e92111cd..eff8a96c75ee 100644
--- a/trunk/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/trunk/arch/arm/mach-shmobile/board-ag5evm.c
@@ -42,7 +42,6 @@
 #include <video/sh_mipi_dsi.h>
 #include <sound/sh_fsi.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/sh73a0.h>
 #include <mach/common.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-shmobile/board-bonito.c b/trunk/arch/arm/mach-shmobile/board-bonito.c
index df9a65382443..4d2201622323 100644
--- a/trunk/arch/arm/mach-shmobile/board-bonito.c
+++ b/trunk/arch/arm/mach-shmobile/board-bonito.c
@@ -34,7 +34,6 @@
 #include <asm/mach/time.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <mach/r8a7740.h>
-#include <mach/irqs.h>
 #include <video/sh_mobile_lcdc.h>
 
 /*
diff --git a/trunk/arch/arm/mach-shmobile/board-g3evm.c b/trunk/arch/arm/mach-shmobile/board-g3evm.c
index 6dbdc428c244..72d557281b1f 100644
--- a/trunk/arch/arm/mach-shmobile/board-g3evm.c
+++ b/trunk/arch/arm/mach-shmobile/board-g3evm.c
@@ -33,7 +33,6 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/dma-mapping.h>
-#include <mach/irqs.h>
 #include <mach/sh7367.h>
 #include <mach/common.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-shmobile/board-g4evm.c b/trunk/arch/arm/mach-shmobile/board-g4evm.c
index 2936ccc95950..2220b885cff5 100644
--- a/trunk/arch/arm/mach-shmobile/board-g4evm.c
+++ b/trunk/arch/arm/mach-shmobile/board-g4evm.c
@@ -34,7 +34,6 @@
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/gpio.h>
 #include <linux/dma-mapping.h>
-#include <mach/irqs.h>
 #include <mach/sh7377.h>
 #include <mach/common.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-shmobile/board-kota2.c b/trunk/arch/arm/mach-shmobile/board-kota2.c
index c71780b2232a..857ceeec1bb0 100644
--- a/trunk/arch/arm/mach-shmobile/board-kota2.c
+++ b/trunk/arch/arm/mach-shmobile/board-kota2.c
@@ -39,7 +39,6 @@
 #include <linux/mfd/tmio.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/sh73a0.h>
 #include <mach/common.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c
index 73f00971d0da..9b42fbd10f8e 100644
--- a/trunk/arch/arm/mach-shmobile/board-mackerel.c
+++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c
@@ -55,7 +55,6 @@
 #include <sound/sh_fsi.h>
 
 #include <mach/common.h>
-#include <mach/irqs.h>
 #include <mach/sh7372.h>
 
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-shmobile/board-marzen.c b/trunk/arch/arm/mach-shmobile/board-marzen.c
index 3b2e88ae26be..f0e02c0ce99f 100644
--- a/trunk/arch/arm/mach-shmobile/board-marzen.c
+++ b/trunk/arch/arm/mach-shmobile/board-marzen.c
@@ -31,7 +31,6 @@
 #include <mach/hardware.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/irqs.h b/trunk/arch/arm/mach-shmobile/include/mach/irqs.h
index 4e686cc201fc..dcb714f4d75a 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/irqs.h
@@ -1,11 +1,15 @@
 #ifndef __ASM_MACH_IRQS_H
 #define __ASM_MACH_IRQS_H
 
-#include <linux/sh_intc.h>
+#define NR_IRQS         1024
 
 /* GIC */
 #define gic_spi(nr)		((nr) + 32)
 
+/* INTCA */
+#define evt2irq(evt)		(((evt) >> 5) - 16)
+#define irq2evt(irq)		(((irq) + 16) << 5)
+
 /* INTCS */
 #define INTCS_VECT_BASE		0x2200
 #define INTCS_VECT(n, vect)	INTC_VECT((n), INTCS_VECT_BASE + (vect))
diff --git a/trunk/arch/arm/mach-shmobile/intc-r8a7740.c b/trunk/arch/arm/mach-shmobile/intc-r8a7740.c
index 09c42afcb22d..272c84c20c83 100644
--- a/trunk/arch/arm/mach-shmobile/intc-r8a7740.c
+++ b/trunk/arch/arm/mach-shmobile/intc-r8a7740.c
@@ -25,7 +25,6 @@
 #include <linux/io.h>
 #include <linux/sh_intc.h>
 #include <mach/intc.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/intc-sh7367.c b/trunk/arch/arm/mach-shmobile/intc-sh7367.c
index 5bf776495b75..cfde9bfc3669 100644
--- a/trunk/arch/arm/mach-shmobile/intc-sh7367.c
+++ b/trunk/arch/arm/mach-shmobile/intc-sh7367.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/sh_intc.h>
 #include <mach/intc.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/intc-sh7372.c b/trunk/arch/arm/mach-shmobile/intc-sh7372.c
index 6447e0af52d4..89afcaba99a1 100644
--- a/trunk/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/trunk/arch/arm/mach-shmobile/intc-sh7372.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/sh_intc.h>
 #include <mach/intc.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/intc-sh7377.c b/trunk/arch/arm/mach-shmobile/intc-sh7377.c
index b84a460a3405..2af4e6e9bc5b 100644
--- a/trunk/arch/arm/mach-shmobile/intc-sh7377.c
+++ b/trunk/arch/arm/mach-shmobile/intc-sh7377.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/sh_intc.h>
 #include <mach/intc.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/intc-sh73a0.c b/trunk/arch/arm/mach-shmobile/intc-sh73a0.c
index 9a8207c6d31f..1eda6b0b69e3 100644
--- a/trunk/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/trunk/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/sh_intc.h>
 #include <mach/intc.h>
-#include <mach/irqs.h>
 #include <mach/sh73a0.h>
 #include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7740.c b/trunk/arch/arm/mach-shmobile/setup-r8a7740.c
index fa15d81267ef..986dca6b3fad 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -25,7 +25,6 @@
 #include <linux/serial_sci.h>
 #include <linux/sh_timer.h>
 #include <mach/r8a7740.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
index 55df21add2d4..4725663bd032 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -29,7 +29,6 @@
 #include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
 #include <asm/mach-types.h>
diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7367.c b/trunk/arch/arm/mach-shmobile/setup-sh7367.c
index 8e84819833a8..e546017f15de 100644
--- a/trunk/arch/arm/mach-shmobile/setup-sh7367.c
+++ b/trunk/arch/arm/mach-shmobile/setup-sh7367.c
@@ -29,7 +29,6 @@
 #include <linux/serial_sci.h>
 #include <linux/sh_timer.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7372.c b/trunk/arch/arm/mach-shmobile/setup-sh7372.c
index 420d25c0d742..6fcf304d3cdf 100644
--- a/trunk/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/trunk/arch/arm/mach-shmobile/setup-sh7372.c
@@ -32,7 +32,6 @@
 #include <linux/sh_timer.h>
 #include <linux/pm_domain.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/sh7372.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7377.c b/trunk/arch/arm/mach-shmobile/setup-sh7377.c
index 747ed8ef84ef..bb405b8e459b 100644
--- a/trunk/arch/arm/mach-shmobile/setup-sh7377.c
+++ b/trunk/arch/arm/mach-shmobile/setup-sh7377.c
@@ -30,7 +30,6 @@
 #include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
diff --git a/trunk/arch/arm/mach-shmobile/setup-sh73a0.c b/trunk/arch/arm/mach-shmobile/setup-sh73a0.c
index 7bf740e29a3a..20e71e5cace4 100644
--- a/trunk/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/trunk/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -31,7 +31,6 @@
 #include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <mach/hardware.h>
-#include <mach/irqs.h>
 #include <mach/sh73a0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/c6x/Kconfig b/trunk/arch/c6x/Kconfig
index 2f58c61e2812..26e67f0f0051 100644
--- a/trunk/arch/c6x/Kconfig
+++ b/trunk/arch/c6x/Kconfig
@@ -11,7 +11,7 @@ config TMS320C6X
 	select HAVE_DMA_API_DEBUG
 	select HAVE_GENERIC_HARDIRQS
 	select HAVE_MEMBLOCK
-	select SPARSE_IRQ
+	select HAVE_SPARSE_IRQ
 	select OF
 	select OF_EARLY_FLATTREE
 
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 06c1cf0f24a6..1919634a9b32 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -133,7 +133,7 @@ config PPC
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
 	select HAVE_GENERIC_HARDIRQS
-	select MAY_HAVE_SPARSE_IRQ
+	select HAVE_SPARSE_IRQ
 	select IRQ_PER_CPU
 	select GENERIC_IRQ_SHOW
 	select GENERIC_IRQ_SHOW_LEVEL
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 21b82a8cca21..3c8db65c89e5 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -22,7 +22,7 @@ config SUPERH
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_GENERIC_HARDIRQS
-	select MAY_HAVE_SPARSE_IRQ
+	select HAVE_SPARSE_IRQ
 	select IRQ_FORCED_THREADING
 	select RTC_LIB
 	select GENERIC_ATOMIC64
diff --git a/trunk/arch/sh/include/asm/irq.h b/trunk/arch/sh/include/asm/irq.h
index 2a62017eb275..45d08b6a5ef7 100644
--- a/trunk/arch/sh/include/asm/irq.h
+++ b/trunk/arch/sh/include/asm/irq.h
@@ -20,6 +20,17 @@
  */
 #define NO_IRQ_IGNORE		((unsigned int)-1)
 
+/*
+ * Convert back and forth between INTEVT and IRQ values.
+ */
+#ifdef CONFIG_CPU_HAS_INTEVT
+#define evt2irq(evt)		(((evt) >> 5) - 16)
+#define irq2evt(irq)		(((irq) + 16) << 5)
+#else
+#define evt2irq(evt)		(evt)
+#define irq2evt(irq)		(irq)
+#endif
+
 /*
  * Simple Mask Register Support
  */
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index fb2da445945f..864cc6e6ac8e 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -69,6 +69,7 @@ config X86
 	select HAVE_ARCH_JUMP_LABEL
 	select HAVE_TEXT_POKE_SMP
 	select HAVE_GENERIC_HARDIRQS
+	select HAVE_SPARSE_IRQ
 	select SPARSE_IRQ
 	select GENERIC_FIND_FIRST_BIT
 	select GENERIC_IRQ_PROBE
diff --git a/trunk/drivers/gpio/gpio-pxa.c b/trunk/drivers/gpio/gpio-pxa.c
index 5689ce62fd81..b2d3ee1d183a 100644
--- a/trunk/drivers/gpio/gpio-pxa.c
+++ b/trunk/drivers/gpio/gpio-pxa.c
@@ -22,8 +22,6 @@
 #include <linux/syscore_ops.h>
 #include <linux/slab.h>
 
-#include <mach/irqs.h>
-
 /*
  * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with
  * one set of registers. The register offsets are organized below:
diff --git a/trunk/drivers/sh/intc/balancing.c b/trunk/drivers/sh/intc/balancing.c
index bc780807ccb0..cec7a96f2c09 100644
--- a/trunk/drivers/sh/intc/balancing.c
+++ b/trunk/drivers/sh/intc/balancing.c
@@ -9,7 +9,7 @@
  */
 #include "internals.h"
 
-static unsigned long dist_handle[INTC_NR_IRQS];
+static unsigned long dist_handle[NR_IRQS];
 
 void intc_balancing_enable(unsigned int irq)
 {
diff --git a/trunk/drivers/sh/intc/core.c b/trunk/drivers/sh/intc/core.c
index 2fde8970dfd0..e53e449b4eca 100644
--- a/trunk/drivers/sh/intc/core.c
+++ b/trunk/drivers/sh/intc/core.c
@@ -42,7 +42,7 @@ unsigned int nr_intc_controllers;
  * - this needs to be at least 2 for 5-bit priorities on 7780
  */
 static unsigned int default_prio_level = 2;	/* 2 - 16 */
-static unsigned int intc_prio_level[INTC_NR_IRQS];	/* for now */
+static unsigned int intc_prio_level[NR_IRQS];	/* for now */
 
 unsigned int intc_get_dfl_prio_level(void)
 {
diff --git a/trunk/drivers/sh/intc/handle.c b/trunk/drivers/sh/intc/handle.c
index f461d5300b81..057ce56829bf 100644
--- a/trunk/drivers/sh/intc/handle.c
+++ b/trunk/drivers/sh/intc/handle.c
@@ -13,7 +13,7 @@
 #include <linux/spinlock.h>
 #include "internals.h"
 
-static unsigned long ack_handle[INTC_NR_IRQS];
+static unsigned long ack_handle[NR_IRQS];
 
 static intc_enum __init intc_grp_id(struct intc_desc *desc,
 				    intc_enum enum_id)
diff --git a/trunk/drivers/sh/intc/virq.c b/trunk/drivers/sh/intc/virq.c
index 93cec21e788b..c7ec49ffd9f6 100644
--- a/trunk/drivers/sh/intc/virq.c
+++ b/trunk/drivers/sh/intc/virq.c
@@ -17,7 +17,7 @@
 #include <linux/export.h>
 #include "internals.h"
 
-static struct intc_map_entry intc_irq_xlate[INTC_NR_IRQS];
+static struct intc_map_entry intc_irq_xlate[NR_IRQS];
 
 struct intc_virq_list {
 	unsigned int irq;
diff --git a/trunk/include/linux/sh_intc.h b/trunk/include/linux/sh_intc.h
index 6aed0805927f..b160645f5599 100644
--- a/trunk/include/linux/sh_intc.h
+++ b/trunk/include/linux/sh_intc.h
@@ -3,23 +3,6 @@
 
 #include <linux/ioport.h>
 
-#ifdef CONFIG_SUPERH
-#define INTC_NR_IRQS	512
-#else
-#define INTC_NR_IRQS	1024
-#endif
-
-/*
- * Convert back and forth between INTEVT and IRQ values.
- */
-#ifdef CONFIG_CPU_HAS_INTEVT
-#define evt2irq(evt)		(((evt) >> 5) - 16)
-#define irq2evt(irq)		(((irq) + 16) << 5)
-#else
-#define evt2irq(evt)		(evt)
-#define irq2evt(irq)		(irq)
-#endif
-
 typedef unsigned char intc_enum;
 
 struct intc_vect {
diff --git a/trunk/kernel/irq/Kconfig b/trunk/kernel/irq/Kconfig
index 1f2dece9ad4c..5a38bf4de641 100644
--- a/trunk/kernel/irq/Kconfig
+++ b/trunk/kernel/irq/Kconfig
@@ -13,7 +13,7 @@ config GENERIC_HARDIRQS
 # Options selectable by the architecture code
 
 # Make sparse irq Kconfig switch below available
-config MAY_HAVE_SPARSE_IRQ
+config HAVE_SPARSE_IRQ
        bool
 
 # Enable the generic irq autoprobe mechanism
@@ -61,7 +61,8 @@ config IRQ_FORCED_THREADING
        bool
 
 config SPARSE_IRQ
-	bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ
+	bool "Support sparse irq numbering"
+	depends on HAVE_SPARSE_IRQ
 	---help---
 
 	  Sparse irq numbering is useful for distro kernels that want
diff --git a/trunk/sound/arm/pxa2xx-ac97-lib.c b/trunk/sound/arm/pxa2xx-ac97-lib.c
index 0e9e82262479..d1aa4218f129 100644
--- a/trunk/sound/arm/pxa2xx-ac97-lib.c
+++ b/trunk/sound/arm/pxa2xx-ac97-lib.c
@@ -21,7 +21,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <mach/irqs.h>
+#include <asm/irq.h>
 #include <mach/regs-ac97.h>
 #include <mach/audio.h>