diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-06 19:50:30 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-06 19:50:30 +0000 |
| commit | 87cb2a558523ba409e0f5bfc1672d6e905ba2d1a (patch) | |
| tree | 03cce3c90df783bd0ec1e67520647c5b85288f15 /target | |
| parent | 9556c473485ff6d7e0ba0a29beaccc3d696c20e1 (diff) | |
linux: update 3.1 to 3.1.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29470 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
10 files changed, 248 insertions, 486 deletions
diff --git a/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch index 3bbadd42a..49a88ec7e 100644 --- a/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch @@ -10,7 +10,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -883,3 +885,5 @@ static void __devinit quirk_usb_early_ha +@@ -882,3 +884,5 @@ static void __devinit quirk_usb_early_ha quirk_usb_handoff_xhci(pdev); } DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index fc299e81a..75fef7eff 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY FEATURES:=squashfs jffs2 DEFAULT_SUBTARGET:=danube -LINUX_VERSION:=3.1.3 +LINUX_VERSION:=3.1.4 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves diff --git a/target/linux/lantiq/patches/0018-MIPS-lantiq-adds-dwc_otg.patch b/target/linux/lantiq/patches/0018-MIPS-lantiq-adds-dwc_otg.patch index ccb698b1f..dd0b10377 100644 --- a/target/linux/lantiq/patches/0018-MIPS-lantiq-adds-dwc_otg.patch +++ b/target/linux/lantiq/patches/0018-MIPS-lantiq-adds-dwc_otg.patch @@ -69,7 +69,7 @@ Subject: [PATCH 18/24] MIPS: lantiq: adds dwc_otg obj-$(CONFIG_USB_WDM) += class/ --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -2885,11 +2885,11 @@ hub_port_init (struct usb_hub *hub, stru +@@ -2891,11 +2891,11 @@ hub_port_init (struct usb_hub *hub, stru udev->ttport = hdev->ttport; } else if (udev->speed != USB_SPEED_HIGH && hdev->speed == USB_SPEED_HIGH) { diff --git a/target/linux/lantiq/patches/211-devices.patch b/target/linux/lantiq/patches/211-devices.patch index eefb9c9da..408d680f1 100644 --- a/target/linux/lantiq/patches/211-devices.patch +++ b/target/linux/lantiq/patches/211-devices.patch @@ -1,7 +1,5 @@ -Index: linux-3.1.1/arch/mips/lantiq/devices.c -=================================================================== ---- linux-3.1.1.orig/arch/mips/lantiq/devices.c 2011-11-14 20:22:33.588135463 +0100 -+++ linux-3.1.1/arch/mips/lantiq/devices.c 2011-11-14 20:22:34.328135495 +0100 +--- a/arch/mips/lantiq/devices.c ++++ b/arch/mips/lantiq/devices.c @@ -18,6 +18,7 @@ #include <linux/time.h> #include <linux/io.h> @@ -10,7 +8,7 @@ Index: linux-3.1.1/arch/mips/lantiq/devices.c #include <asm/bootinfo.h> #include <asm/irq.h> -@@ -100,3 +101,20 @@ +@@ -100,3 +101,20 @@ void __init ltq_register_pci(struct ltq_ pr_err("kernel is compiled without PCI support\n"); } #endif @@ -31,21 +29,17 @@ Index: linux-3.1.1/arch/mips/lantiq/devices.c + cp1_base = + (void*)CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE, &dma, GFP_ATOMIC)); +} -Index: linux-3.1.1/arch/mips/lantiq/devices.h -=================================================================== ---- linux-3.1.1.orig/arch/mips/lantiq/devices.h 2011-11-14 20:22:33.588135463 +0100 -+++ linux-3.1.1/arch/mips/lantiq/devices.h 2011-11-14 20:22:34.328135495 +0100 -@@ -23,5 +23,6 @@ +--- a/arch/mips/lantiq/devices.h ++++ b/arch/mips/lantiq/devices.h +@@ -23,5 +23,6 @@ extern void ltq_register_nor(struct phys extern void ltq_register_wdt(void); extern void ltq_register_asc(int port); extern void ltq_register_pci(struct ltq_pci_data *data); +extern void ltq_register_tapi(void); #endif -Index: linux-3.1.1/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.1.1.orig/arch/mips/lantiq/xway/Makefile 2011-11-14 20:22:34.304135491 +0100 -+++ linux-3.1.1/arch/mips/lantiq/xway/Makefile 2011-11-14 20:39:51.404179655 +0100 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,5 +1,7 @@ obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o nand.o timer.o @@ -54,10 +48,8 @@ Index: linux-3.1.1/arch/mips/lantiq/xway/Makefile obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-vr9.o -Index: linux-3.1.1/arch/mips/lantiq/xway/devices.c -=================================================================== ---- linux-3.1.1.orig/arch/mips/lantiq/xway/devices.c 2011-11-14 20:22:34.092135483 +0100 -+++ linux-3.1.1/arch/mips/lantiq/xway/devices.c 2011-11-14 20:22:34.328135495 +0100 +--- a/arch/mips/lantiq/xway/devices.c ++++ b/arch/mips/lantiq/xway/devices.c @@ -19,6 +19,7 @@ #include <linux/time.h> #include <linux/io.h> @@ -66,7 +58,7 @@ Index: linux-3.1.1/arch/mips/lantiq/xway/devices.c #include <asm/bootinfo.h> #include <asm/irq.h> -@@ -99,3 +100,98 @@ +@@ -99,3 +100,98 @@ ltq_register_etop(struct ltq_eth_data *e platform_device_register(<q_etop); } } @@ -165,10 +157,8 @@ Index: linux-3.1.1/arch/mips/lantiq/xway/devices.c + ltq_spi.dev.platform_data = pdata; + platform_device_register(<q_spi); +} -Index: linux-3.1.1/arch/mips/lantiq/xway/devices.h -=================================================================== ---- linux-3.1.1.orig/arch/mips/lantiq/xway/devices.h 2011-11-11 21:19:27.000000000 +0100 -+++ linux-3.1.1/arch/mips/lantiq/xway/devices.h 2011-11-14 20:22:34.328135495 +0100 +--- a/arch/mips/lantiq/xway/devices.h ++++ b/arch/mips/lantiq/xway/devices.h @@ -11,10 +11,17 @@ #include "../devices.h" @@ -187,10 +177,8 @@ Index: linux-3.1.1/arch/mips/lantiq/xway/devices.h +extern void ltq_register_gpio_buttons(struct gpio_button *buttons, int cnt); #endif -Index: linux-3.1.1/arch/mips/lantiq/Makefile -=================================================================== ---- linux-3.1.1.orig/arch/mips/lantiq/Makefile 2011-11-14 20:22:33.640135462 +0100 -+++ linux-3.1.1/arch/mips/lantiq/Makefile 2011-11-14 20:39:09.852178049 +0100 +--- a/arch/mips/lantiq/Makefile ++++ b/arch/mips/lantiq/Makefile @@ -4,7 +4,7 @@ # under the terms of the GNU General Public License version 2 as published # by the Free Software Foundation. diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile index 04f246066..e891b89cb 100644 --- a/target/linux/omap24xx/Makefile +++ b/target/linux/omap24xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx MAINTAINER:=Michael Buesch <m@bues.ch> FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio -LINUX_VERSION:=3.1.3 +LINUX_VERSION:=3.1.4 define Target/Description TI OMAP-24xx diff --git a/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch b/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch index fe3224ab5..6da3478dc 100644 --- a/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch +++ b/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch @@ -1,7 +1,5 @@ -Index: linux-3.1.1/arch/arm/Kconfig -=================================================================== ---- linux-3.1.1.orig/arch/arm/Kconfig 2011-11-17 15:36:08.005974898 +0100 -+++ linux-3.1.1/arch/arm/Kconfig 2011-11-17 15:36:47.117577734 +0100 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig @@ -1876,7 +1876,7 @@ config XIP_PHYS_ADDR config KEXEC @@ -11,10 +9,8 @@ Index: linux-3.1.1/arch/arm/Kconfig help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot -Index: linux-3.1.1/arch/arm/include/asm/idmap.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1.1/arch/arm/include/asm/idmap.h 2011-11-17 15:36:47.121577693 +0100 +--- /dev/null ++++ b/arch/arm/include/asm/idmap.h @@ -0,0 +1,11 @@ +#ifndef __ASM_IDMAP_H +#define __ASM_IDMAP_H @@ -27,10 +23,8 @@ Index: linux-3.1.1/arch/arm/include/asm/idmap.h +void setup_mm_for_reboot(void); + +#endif /* __ASM_IDMAP_H */ -Index: linux-3.1.1/arch/arm/include/asm/mach/arch.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/include/asm/mach/arch.h 2011-11-17 15:36:08.601968818 +0100 -+++ linux-3.1.1/arch/arm/include/asm/mach/arch.h 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/include/asm/mach/arch.h ++++ b/arch/arm/include/asm/mach/arch.h @@ -30,10 +30,10 @@ struct machine_desc { unsigned int video_start; /* start of video RAM */ unsigned int video_end; /* end of video RAM */ @@ -54,10 +48,8 @@ Index: linux-3.1.1/arch/arm/include/asm/mach/arch.h }; /* -Index: linux-3.1.1/arch/arm/include/asm/system.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/include/asm/system.h 2011-11-17 15:36:08.613968696 +0100 -+++ linux-3.1.1/arch/arm/include/asm/system.h 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/include/asm/system.h ++++ b/arch/arm/include/asm/system.h @@ -107,7 +107,7 @@ extern void __show_regs(struct pt_regs * extern int cpu_architecture(void); extern void cpu_init(void); @@ -67,10 +59,8 @@ Index: linux-3.1.1/arch/arm/include/asm/system.h extern void (*arm_pm_restart)(char str, const char *cmd); #define UDBG_UNDEFINED (1 << 0) -Index: linux-3.1.1/arch/arm/kernel/machine_kexec.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/kernel/machine_kexec.c 2011-11-17 15:36:08.409970777 +0100 -+++ linux-3.1.1/arch/arm/kernel/machine_kexec.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/kernel/machine_kexec.c ++++ b/arch/arm/kernel/machine_kexec.c @@ -12,12 +12,11 @@ #include <asm/mmu_context.h> #include <asm/cacheflush.h> @@ -102,10 +92,8 @@ Index: linux-3.1.1/arch/arm/kernel/machine_kexec.c + + soft_restart(reboot_code_buffer_phys); } -Index: linux-3.1.1/arch/arm/kernel/process.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/kernel/process.c 2011-11-17 15:36:08.433970532 +0100 -+++ linux-3.1.1/arch/arm/kernel/process.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/kernel/process.c ++++ b/arch/arm/kernel/process.c @@ -57,7 +57,7 @@ static const char *isa_modes[] = { "ARM" , "Thumb" , "Jazelle", "ThumbEE" }; @@ -229,10 +217,8 @@ Index: linux-3.1.1/arch/arm/kernel/process.c } void __show_regs(struct pt_regs *regs) -Index: linux-3.1.1/arch/arm/kernel/setup.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/kernel/setup.c 2011-11-17 15:36:08.429970573 +0100 -+++ linux-3.1.1/arch/arm/kernel/setup.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/kernel/setup.c ++++ b/arch/arm/kernel/setup.c @@ -890,8 +890,8 @@ void __init setup_arch(char **cmdline_p) machine_desc = mdesc; machine_name = mdesc->name; @@ -254,10 +240,8 @@ Index: linux-3.1.1/arch/arm/kernel/setup.c unflatten_device_tree(); #ifdef CONFIG_SMP -Index: linux-3.1.1/arch/arm/kernel/smp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/kernel/smp.c 2011-11-17 15:36:08.417970695 +0100 -+++ linux-3.1.1/arch/arm/kernel/smp.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/kernel/smp.c ++++ b/arch/arm/kernel/smp.c @@ -558,6 +558,10 @@ static void ipi_cpu_stop(unsigned int cp local_fiq_disable(); local_irq_disable(); @@ -269,10 +253,8 @@ Index: linux-3.1.1/arch/arm/kernel/smp.c while (1) cpu_relax(); } -Index: linux-3.1.1/arch/arm/kernel/vmlinux.lds.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/kernel/vmlinux.lds.S 2011-11-17 15:36:08.421970654 +0100 -+++ linux-3.1.1/arch/arm/kernel/vmlinux.lds.S 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/kernel/vmlinux.lds.S ++++ b/arch/arm/kernel/vmlinux.lds.S @@ -91,6 +91,7 @@ SECTIONS SCHED_TEXT LOCK_TEXT @@ -281,10 +263,8 @@ Index: linux-3.1.1/arch/arm/kernel/vmlinux.lds.S #ifdef CONFIG_MMU *(.fixup) #endif -Index: linux-3.1.1/arch/arm/lib/Makefile -=================================================================== ---- linux-3.1.1.orig/arch/arm/lib/Makefile 2011-11-17 15:36:08.593968900 +0100 -+++ linux-3.1.1/arch/arm/lib/Makefile 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/lib/Makefile ++++ b/arch/arm/lib/Makefile @@ -13,7 +13,8 @@ lib-y := backtrace.o changebit.o csumip testchangebit.o testclearbit.o testsetbit.o \ ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ @@ -295,10 +275,8 @@ Index: linux-3.1.1/arch/arm/lib/Makefile mmu-y := clear_user.o copy_page.o getuser.o putuser.o -Index: linux-3.1.1/arch/arm/lib/call_with_stack.S -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1.1/arch/arm/lib/call_with_stack.S 2011-11-17 15:36:47.121577693 +0100 +--- /dev/null ++++ b/arch/arm/lib/call_with_stack.S @@ -0,0 +1,44 @@ +/* + * arch/arm/lib/call_with_stack.S @@ -344,10 +322,8 @@ Index: linux-3.1.1/arch/arm/lib/call_with_stack.S + ldr sp, [sp, #4] + mov pc, lr +ENDPROC(call_with_stack) -Index: linux-3.1.1/arch/arm/mach-omap2/board-2430sdp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-2430sdp.c 2011-11-17 15:36:08.137973551 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-2430sdp.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-2430sdp.c ++++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -34,7 +34,7 @@ #include <asm/mach/map.h> @@ -363,10 +339,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-2430sdp.c .timer = &omap2_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-3430sdp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-3430sdp.c 2011-11-17 15:36:08.125973674 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-3430sdp.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-3430sdp.c ++++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -33,7 +33,7 @@ #include <plat/mcspi.h> #include <plat/board.h> @@ -382,10 +356,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-3430sdp.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-3630sdp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-3630sdp.c 2011-11-17 15:36:08.065974286 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-3630sdp.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-3630sdp.c ++++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -16,7 +16,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -401,10 +373,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-3630sdp.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-4430sdp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-4430sdp.c 2011-11-17 15:36:08.369971185 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-4430sdp.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-4430sdp.c ++++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -27,13 +27,12 @@ #include <linux/leds_pwm.h> @@ -426,10 +396,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-4430sdp.c .timer = &omap4_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-am3517crane.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-am3517crane.c 2011-11-17 15:36:08.265972246 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-am3517crane.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-am3517crane.c ++++ b/arch/arm/mach-omap2/board-am3517crane.c @@ -27,7 +27,7 @@ #include <asm/mach/map.h> @@ -445,10 +413,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-am3517crane.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-am3517evm.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-am3517evm.c 2011-11-17 15:36:08.237972531 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-am3517evm.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-am3517evm.c ++++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -32,7 +32,7 @@ #include <asm/mach/map.h> @@ -464,10 +430,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-am3517evm.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-apollon.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-apollon.c 2011-11-17 15:36:08.033974612 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-apollon.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-apollon.c ++++ b/arch/arm/mach-omap2/board-apollon.c @@ -37,7 +37,7 @@ #include <plat/led.h> #include <plat/usb.h> @@ -483,10 +447,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-apollon.c .timer = &omap2_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-cm-t35.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-cm-t35.c 2011-11-17 15:36:08.285972042 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-cm-t35.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-cm-t35.c ++++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -37,7 +37,7 @@ #include <asm/mach/map.h> @@ -510,10 +472,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-cm-t35.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-cm-t3517.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-cm-t3517.c 2011-11-17 15:36:08.049974449 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-cm-t3517.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-cm-t3517.c ++++ b/arch/arm/mach-omap2/board-cm-t3517.c @@ -39,7 +39,7 @@ #include <asm/mach/map.h> @@ -529,10 +489,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-cm-t3517.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-devkit8000.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-devkit8000.c 2011-11-17 15:36:08.037974571 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-devkit8000.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-devkit8000.c ++++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -41,7 +41,7 @@ #include <asm/mach/flash.h> @@ -548,10 +506,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-devkit8000.c .timer = &omap3_secure_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-h4.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-h4.c 2011-11-17 15:36:08.017974775 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-h4.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-h4.c ++++ b/arch/arm/mach-omap2/board-h4.c @@ -34,7 +34,7 @@ #include <mach/gpio.h> #include <plat/usb.h> @@ -567,10 +523,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-h4.c .timer = &omap2_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-igep0020.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-igep0020.c 2011-11-17 15:36:08.149973429 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-igep0020.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-igep0020.c ++++ b/arch/arm/mach-omap2/board-igep0020.c @@ -28,7 +28,7 @@ #include <asm/mach/arch.h> @@ -594,10 +548,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-igep0020.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-ldp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-ldp.c 2011-11-17 15:36:08.165973266 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-ldp.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-ldp.c ++++ b/arch/arm/mach-omap2/board-ldp.c @@ -36,7 +36,7 @@ #include <plat/mcspi.h> #include <mach/gpio.h> @@ -613,10 +565,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-ldp.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-n8x0.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-11-17 15:36:09.437960291 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-n8x0.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-n8x0.c ++++ b/arch/arm/mach-omap2/board-n8x0.c @@ -26,7 +26,7 @@ #include <asm/mach-types.h> @@ -648,10 +598,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-n8x0.c .timer = &omap2_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3beagle.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap3beagle.c 2011-11-17 15:36:08.277972123 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap3beagle.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -40,7 +40,7 @@ #include <asm/mach/flash.h> @@ -667,10 +615,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3beagle.c .timer = &omap3_secure_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3evm.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap3evm.c 2011-11-17 15:36:08.373971144 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap3evm.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap3evm.c ++++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -42,7 +42,7 @@ #include <plat/board.h> @@ -686,10 +632,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3evm.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3logic.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap3logic.c 2011-11-17 15:36:08.189973021 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap3logic.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap3logic.c ++++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -40,7 +40,7 @@ #include <plat/mux.h> @@ -713,10 +657,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3logic.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3pandora.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap3pandora.c 2011-11-17 15:36:08.121973715 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap3pandora.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap3pandora.c ++++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -41,7 +41,7 @@ #include <asm/mach/map.h> @@ -732,10 +674,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3pandora.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3stalker.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap3stalker.c 2011-11-17 15:36:08.361971266 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap3stalker.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap3stalker.c ++++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -35,7 +35,7 @@ #include <asm/mach/flash.h> @@ -751,10 +691,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3stalker.c .timer = &omap3_secure_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3touchbook.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap3touchbook.c 2011-11-17 15:36:08.337971511 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap3touchbook.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap3touchbook.c ++++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -44,7 +44,7 @@ #include <asm/mach/flash.h> @@ -770,10 +708,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap3touchbook.c .timer = &omap3_secure_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-omap4panda.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-omap4panda.c 2011-11-17 15:36:08.245972450 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-omap4panda.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-omap4panda.c ++++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -30,14 +30,13 @@ #include <linux/wl12xx.h> @@ -796,10 +732,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-omap4panda.c .timer = &omap4_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-overo.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-overo.c 2011-11-17 15:36:08.197972939 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-overo.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-overo.c ++++ b/arch/arm/mach-omap2/board-overo.c @@ -43,7 +43,7 @@ #include <asm/mach/map.h> @@ -815,10 +749,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-overo.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-rm680.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-rm680.c 2011-11-17 15:36:08.257972327 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-rm680.c 2011-11-17 15:36:47.121577693 +0100 +--- a/arch/arm/mach-omap2/board-rm680.c ++++ b/arch/arm/mach-omap2/board-rm680.c @@ -25,7 +25,7 @@ #include <plat/mmc.h> #include <plat/usb.h> @@ -834,10 +766,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-rm680.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-rx51-peripherals.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-rx51-peripherals.c 2011-11-17 15:36:08.061974327 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-rx51-peripherals.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/board-rx51-peripherals.c ++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -27,7 +27,7 @@ #include <plat/mcspi.h> @@ -847,10 +777,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-rx51-peripherals.c #include <plat/dma.h> #include <plat/gpmc.h> #include <plat/onenand.h> -Index: linux-3.1.1/arch/arm/mach-omap2/board-rx51.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-rx51.c 2011-11-17 15:36:08.213972776 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-rx51.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/board-rx51.c ++++ b/arch/arm/mach-omap2/board-rx51.c @@ -25,7 +25,7 @@ #include <plat/mcspi.h> @@ -866,10 +794,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-rx51.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-ti8168evm.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-ti8168evm.c 2011-11-17 15:36:08.357971307 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-ti8168evm.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/board-ti8168evm.c ++++ b/arch/arm/mach-omap2/board-ti8168evm.c @@ -22,7 +22,7 @@ #include <plat/irqs.h> @@ -885,10 +811,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-ti8168evm.c .init_machine = ti8168_evm_init, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/board-zoom-peripherals.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-zoom-peripherals.c 2011-11-17 15:36:08.321971674 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-zoom-peripherals.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/board-zoom-peripherals.c ++++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -24,7 +24,7 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -898,10 +822,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-zoom-peripherals.c #include <plat/usb.h> #include <mach/board-zoom.h> -Index: linux-3.1.1/arch/arm/mach-omap2/board-zoom.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/board-zoom.c 2011-11-17 15:36:08.045974490 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/board-zoom.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/board-zoom.c ++++ b/arch/arm/mach-omap2/board-zoom.c @@ -21,7 +21,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -925,10 +847,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/board-zoom.c .timer = &omap3_timer, + .restart = omap_prcm_restart, MACHINE_END -Index: linux-3.1.1/arch/arm/mach-omap2/cm2xxx_3xxx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/cm2xxx_3xxx.c 2011-11-17 15:36:08.089974041 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/cm2xxx_3xxx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/cm2xxx_3xxx.c ++++ b/arch/arm/mach-omap2/cm2xxx_3xxx.c @@ -18,7 +18,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -938,10 +858,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/cm2xxx_3xxx.c #include "cm.h" #include "cm2xxx_3xxx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/cm44xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/cm44xx.c 2011-11-17 15:36:08.117973755 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/cm44xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/cm44xx.c ++++ b/arch/arm/mach-omap2/cm44xx.c @@ -18,7 +18,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -951,10 +869,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/cm44xx.c #include "cm.h" #include "cm1_44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/cminst44xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/cminst44xx.c 2011-11-17 15:36:08.253972368 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/cminst44xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/cminst44xx.c ++++ b/arch/arm/mach-omap2/cminst44xx.c @@ -20,7 +20,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -964,10 +880,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/cminst44xx.c #include "cm.h" #include "cm1_44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/common.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/common.c 2011-11-17 15:36:08.025974694 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/common.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/common.c ++++ b/arch/arm/mach-omap2/common.c @@ -17,7 +17,7 @@ #include <linux/clk.h> #include <linux/io.h> @@ -977,10 +891,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/common.c #include <plat/board.h> #include <plat/mux.h> -Index: linux-3.1.1/arch/arm/mach-omap2/common.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.1.1/arch/arm/mach-omap2/common.h 2011-11-17 15:36:47.125577653 +0100 +--- /dev/null ++++ b/arch/arm/mach-omap2/common.h @@ -0,0 +1,186 @@ +/* + * Header for code common to all OMAP2+ machines. @@ -1168,10 +1080,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/common.h +#endif + +#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ -Index: linux-3.1.1/arch/arm/mach-omap2/control.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/control.c 2011-11-17 15:36:08.225972654 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/control.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/control.c ++++ b/arch/arm/mach-omap2/control.c @@ -15,7 +15,7 @@ #include <linux/kernel.h> #include <linux/io.h> @@ -1181,10 +1091,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/control.c #include <plat/sdrc.h> #include "cm-regbits-34xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/i2c.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/i2c.c 2011-11-17 15:36:08.205972858 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/i2c.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/i2c.c ++++ b/arch/arm/mach-omap2/i2c.c @@ -21,7 +21,7 @@ #include <plat/cpu.h> @@ -1194,10 +1102,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/i2c.c #include <plat/omap_hwmod.h> #include "mux.h" -Index: linux-3.1.1/arch/arm/mach-omap2/id.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/id.c 2011-11-17 15:36:08.157973347 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/id.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/id.c ++++ b/arch/arm/mach-omap2/id.c @@ -21,7 +21,7 @@ #include <asm/cputype.h> @@ -1207,10 +1113,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/id.c #include <plat/cpu.h> #include <mach/id.h> -Index: linux-3.1.1/arch/arm/mach-omap2/include/mach/omap4-common.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/include/mach/omap4-common.h 2011-11-17 15:36:08.309971797 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/arch/arm/mach-omap2/include/mach/omap4-common.h ++++ /dev/null @@ -1,43 +0,0 @@ -/* - * omap4-common.h: OMAP4 specific common header file @@ -1255,10 +1159,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/include/mach/omap4-common.h -extern u32 omap_read_auxcoreboot0(void); -#endif -#endif -Index: linux-3.1.1/arch/arm/mach-omap2/omap-hotplug.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/omap-hotplug.c 2011-11-17 15:36:08.177973143 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/omap-hotplug.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/omap-hotplug.c ++++ b/arch/arm/mach-omap2/omap-hotplug.c @@ -19,7 +19,8 @@ #include <linux/smp.h> @@ -1269,10 +1171,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/omap-hotplug.c int platform_cpu_kill(unsigned int cpu) { -Index: linux-3.1.1/arch/arm/mach-omap2/omap-smp.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/omap-smp.c 2011-11-17 15:36:08.305971837 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/omap-smp.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/omap-smp.c ++++ b/arch/arm/mach-omap2/omap-smp.c @@ -24,7 +24,8 @@ #include <asm/hardware/gic.h> #include <asm/smp_scu.h> @@ -1283,10 +1183,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/omap-smp.c /* SCU base address */ static void __iomem *scu_base; -Index: linux-3.1.1/arch/arm/mach-omap2/omap4-common.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/omap4-common.c 2011-11-17 15:36:08.201972898 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/omap4-common.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/omap4-common.c ++++ b/arch/arm/mach-omap2/omap4-common.c @@ -22,7 +22,8 @@ #include <plat/irqs.h> @@ -1297,10 +1195,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/omap4-common.c #ifdef CONFIG_CACHE_L2X0 void __iomem *l2cache_base; -Index: linux-3.1.1/arch/arm/mach-omap2/omap_hwmod.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/omap_hwmod.c 2011-11-17 15:36:09.281961882 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/omap_hwmod.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/omap_hwmod.c ++++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -137,7 +137,7 @@ #include <linux/mutex.h> #include <linux/spinlock.h> @@ -1310,10 +1206,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/omap_hwmod.c #include <plat/cpu.h> #include "clockdomain.h" #include "powerdomain.h" -Index: linux-3.1.1/arch/arm/mach-omap2/pm.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/pm.c 2011-11-17 15:36:08.145973470 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/pm.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/pm.c ++++ b/arch/arm/mach-omap2/pm.c @@ -17,7 +17,7 @@ #include <plat/omap-pm.h> @@ -1323,10 +1217,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/pm.c #include "voltage.h" #include "powerdomain.h" -Index: linux-3.1.1/arch/arm/mach-omap2/pm24xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/pm24xx.c 2011-11-17 15:36:08.333971552 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/pm24xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/pm24xx.c ++++ b/arch/arm/mach-omap2/pm24xx.c @@ -42,6 +42,7 @@ #include <plat/dma.h> #include <plat/board.h> @@ -1335,10 +1227,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/pm24xx.c #include "prm2xxx_3xxx.h" #include "prm-regbits-24xx.h" #include "cm2xxx_3xxx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/pm34xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/pm34xx.c 2011-11-17 15:36:08.241972490 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/pm34xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/pm34xx.c ++++ b/arch/arm/mach-omap2/pm34xx.c @@ -42,6 +42,7 @@ #include <plat/gpmc.h> #include <plat/dma.h> @@ -1347,10 +1237,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/pm34xx.c #include "cm2xxx_3xxx.h" #include "cm-regbits-34xx.h" #include "prm-regbits-34xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/pm44xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/pm44xx.c 2011-11-17 15:36:08.217972735 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/pm44xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/pm44xx.c ++++ b/arch/arm/mach-omap2/pm44xx.c @@ -16,8 +16,8 @@ #include <linux/err.h> #include <linux/slab.h> @@ -1361,10 +1249,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/pm44xx.c struct power_state { struct powerdomain *pwrdm; -Index: linux-3.1.1/arch/arm/mach-omap2/prcm.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/prcm.c 2011-11-17 15:36:08.133973592 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/prcm.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/prcm.c ++++ b/arch/arm/mach-omap2/prcm.c @@ -24,8 +24,7 @@ #include <linux/io.h> #include <linux/delay.h> @@ -1393,10 +1279,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/prcm.c /** * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness * @reg: physical address of module IDLEST register -Index: linux-3.1.1/arch/arm/mach-omap2/prcm_mpu44xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/prcm_mpu44xx.c 2011-11-17 15:36:08.161973306 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/prcm_mpu44xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/prcm_mpu44xx.c ++++ b/arch/arm/mach-omap2/prcm_mpu44xx.c @@ -15,7 +15,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -1406,10 +1290,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/prcm_mpu44xx.c #include "prcm_mpu44xx.h" #include "cm-regbits-44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/prm2xxx_3xxx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/prm2xxx_3xxx.c 2011-11-17 15:36:08.073974204 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/prm2xxx_3xxx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/prm2xxx_3xxx.c ++++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c @@ -16,7 +16,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -1419,10 +1301,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/prm2xxx_3xxx.c #include <plat/cpu.h> #include <plat/prcm.h> -Index: linux-3.1.1/arch/arm/mach-omap2/prm44xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/prm44xx.c 2011-11-17 15:36:08.109973837 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/prm44xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/prm44xx.c ++++ b/arch/arm/mach-omap2/prm44xx.c @@ -17,7 +17,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -1432,10 +1312,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/prm44xx.c #include <plat/cpu.h> #include <plat/prcm.h> -Index: linux-3.1.1/arch/arm/mach-omap2/prminst44xx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/prminst44xx.c 2011-11-17 15:36:08.097973959 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/prminst44xx.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/prminst44xx.c ++++ b/arch/arm/mach-omap2/prminst44xx.c @@ -16,7 +16,7 @@ #include <linux/err.h> #include <linux/io.h> @@ -1445,10 +1323,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/prminst44xx.c #include "prm44xx.h" #include "prminst44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/sdram-nokia.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/sdram-nokia.c 2011-11-17 15:36:08.185973062 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/sdram-nokia.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/sdram-nokia.c ++++ b/arch/arm/mach-omap2/sdram-nokia.c @@ -18,7 +18,7 @@ #include <linux/io.h> @@ -1458,10 +1334,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/sdram-nokia.c #include <plat/clock.h> #include <plat/sdrc.h> -Index: linux-3.1.1/arch/arm/mach-omap2/sdrc.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/sdrc.c 2011-11-17 15:36:08.297971919 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/sdrc.c 2011-11-17 15:36:47.125577653 +0100 +--- a/arch/arm/mach-omap2/sdrc.c ++++ b/arch/arm/mach-omap2/sdrc.c @@ -23,7 +23,7 @@ #include <linux/clk.h> #include <linux/io.h> @@ -1471,10 +1345,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/sdrc.c #include <plat/clock.h> #include <plat/sram.h> -Index: linux-3.1.1/arch/arm/mach-omap2/sdrc2xxx.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/sdrc2xxx.c 2011-11-17 15:36:08.009974857 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/sdrc2xxx.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/sdrc2xxx.c ++++ b/arch/arm/mach-omap2/sdrc2xxx.c @@ -24,7 +24,7 @@ #include <linux/clk.h> #include <linux/io.h> @@ -1484,10 +1356,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/sdrc2xxx.c #include <plat/clock.h> #include <plat/sram.h> -Index: linux-3.1.1/arch/arm/mach-omap2/serial.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/serial.c 2011-11-17 15:36:08.905965717 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/serial.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/serial.c ++++ b/arch/arm/mach-omap2/serial.c @@ -33,7 +33,7 @@ #include <plat/omap-serial.h> #endif @@ -1497,10 +1367,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/serial.c #include <plat/board.h> #include <plat/clock.h> #include <plat/dma.h> -Index: linux-3.1.1/arch/arm/mach-omap2/smartreflex.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/smartreflex.c 2011-11-17 15:36:08.281972082 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/smartreflex.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/smartreflex.c ++++ b/arch/arm/mach-omap2/smartreflex.c @@ -25,7 +25,7 @@ #include <linux/slab.h> #include <linux/pm_runtime.h> @@ -1510,10 +1378,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/smartreflex.c #include "pm.h" #include "smartreflex.h" -Index: linux-3.1.1/arch/arm/mach-omap2/timer.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/timer.c 2011-11-17 15:36:08.329971593 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/timer.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/timer.c ++++ b/arch/arm/mach-omap2/timer.c @@ -40,7 +40,7 @@ #include <plat/dmtimer.h> #include <asm/localtimer.h> @@ -1523,10 +1389,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/timer.c #include <plat/omap_hwmod.h> /* Parent clocks, eventually these will come from the clock framework */ -Index: linux-3.1.1/arch/arm/mach-omap2/vc3xxx_data.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/vc3xxx_data.c 2011-11-17 15:36:08.085974082 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/vc3xxx_data.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/vc3xxx_data.c ++++ b/arch/arm/mach-omap2/vc3xxx_data.c @@ -18,7 +18,7 @@ #include <linux/err.h> #include <linux/init.h> @@ -1536,10 +1400,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/vc3xxx_data.c #include "prm-regbits-34xx.h" #include "voltage.h" -Index: linux-3.1.1/arch/arm/mach-omap2/vc44xx_data.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/vc44xx_data.c 2011-11-17 15:36:08.173973184 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/vc44xx_data.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/vc44xx_data.c ++++ b/arch/arm/mach-omap2/vc44xx_data.c @@ -18,7 +18,7 @@ #include <linux/err.h> #include <linux/init.h> @@ -1549,10 +1411,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/vc44xx_data.c #include "prm44xx.h" #include "prm-regbits-44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/voltage.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/voltage.c 2011-11-17 15:36:08.345971429 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/voltage.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/voltage.c ++++ b/arch/arm/mach-omap2/voltage.c @@ -26,7 +26,7 @@ #include <linux/debugfs.h> #include <linux/slab.h> @@ -1562,10 +1422,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/voltage.c #include "prm-regbits-34xx.h" #include "prm-regbits-44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/voltagedomains3xxx_data.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/voltagedomains3xxx_data.c 2011-11-17 15:36:08.269972205 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/voltagedomains3xxx_data.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c ++++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c @@ -18,7 +18,7 @@ #include <linux/err.h> #include <linux/init.h> @@ -1575,10 +1433,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/voltagedomains3xxx_data.c #include <plat/cpu.h> #include "prm-regbits-34xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/voltagedomains44xx_data.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/voltagedomains44xx_data.c 2011-11-17 15:36:08.229972613 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/voltagedomains44xx_data.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c ++++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -21,7 +21,7 @@ #include <linux/err.h> #include <linux/init.h> @@ -1588,10 +1444,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/voltagedomains44xx_data.c #include "prm-regbits-44xx.h" #include "prm44xx.h" -Index: linux-3.1.1/arch/arm/mach-omap2/vp3xxx_data.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/vp3xxx_data.c 2011-11-17 15:36:08.105973878 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/vp3xxx_data.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/vp3xxx_data.c ++++ b/arch/arm/mach-omap2/vp3xxx_data.c @@ -19,7 +19,7 @@ #include <linux/err.h> #include <linux/init.h> @@ -1601,10 +1455,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/vp3xxx_data.c #include "prm-regbits-34xx.h" #include "voltage.h" -Index: linux-3.1.1/arch/arm/mach-omap2/vp44xx_data.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/vp44xx_data.c 2011-11-17 15:36:08.021974735 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/vp44xx_data.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mach-omap2/vp44xx_data.c ++++ b/arch/arm/mach-omap2/vp44xx_data.c @@ -19,7 +19,7 @@ #include <linux/err.h> #include <linux/init.h> @@ -1614,10 +1466,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/vp44xx_data.c #include "prm44xx.h" #include "prm-regbits-44xx.h" -Index: linux-3.1.1/arch/arm/mm/idmap.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/idmap.c 2011-11-17 15:36:08.533969512 +0100 -+++ linux-3.1.1/arch/arm/mm/idmap.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/idmap.c ++++ b/arch/arm/mm/idmap.c @@ -1,8 +1,12 @@ #include <linux/kernel.h> @@ -1687,10 +1537,8 @@ Index: linux-3.1.1/arch/arm/mm/idmap.c + /* Flush the TLB. */ local_flush_tlb_all(); } -Index: linux-3.1.1/arch/arm/mm/nommu.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/nommu.c 2011-11-17 15:36:08.453970328 +0100 -+++ linux-3.1.1/arch/arm/mm/nommu.c 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/nommu.c ++++ b/arch/arm/mm/nommu.c @@ -43,7 +43,7 @@ void __init paging_init(struct machine_d /* * We don't need to do anything here for nommu machines. @@ -1700,10 +1548,8 @@ Index: linux-3.1.1/arch/arm/mm/nommu.c { } -Index: linux-3.1.1/arch/arm/mm/proc-arm1020.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm1020.S 2011-11-17 15:36:08.573969104 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm1020.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm1020.S ++++ b/arch/arm/mm/proc-arm1020.S @@ -95,6 +95,7 @@ ENTRY(cpu_arm1020_proc_fin) * loc: location to jump to for soft reset */ @@ -1721,10 +1567,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm1020.S /* * cpu_arm1020_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm1020e.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm1020e.S 2011-11-17 15:36:08.541969430 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm1020e.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm1020e.S ++++ b/arch/arm/mm/proc-arm1020e.S @@ -95,6 +95,7 @@ ENTRY(cpu_arm1020e_proc_fin) * loc: location to jump to for soft reset */ @@ -1742,10 +1586,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm1020e.S /* * cpu_arm1020e_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm1022.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm1022.S 2011-11-17 15:36:08.537969471 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm1022.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm1022.S ++++ b/arch/arm/mm/proc-arm1022.S @@ -84,6 +84,7 @@ ENTRY(cpu_arm1022_proc_fin) * loc: location to jump to for soft reset */ @@ -1763,10 +1605,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm1022.S /* * cpu_arm1022_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm1026.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm1026.S 2011-11-17 15:36:08.577969063 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm1026.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm1026.S ++++ b/arch/arm/mm/proc-arm1026.S @@ -84,6 +84,7 @@ ENTRY(cpu_arm1026_proc_fin) * loc: location to jump to for soft reset */ @@ -1784,10 +1624,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm1026.S /* * cpu_arm1026_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm6_7.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm6_7.S 2011-11-17 15:36:08.521969634 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm6_7.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm6_7.S ++++ b/arch/arm/mm/proc-arm6_7.S @@ -225,6 +225,7 @@ ENTRY(cpu_arm7_set_pte_ext) * Params : r0 = address to jump to * Notes : This sets up everything for a reset @@ -1806,10 +1644,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm6_7.S __CPUINIT -Index: linux-3.1.1/arch/arm/mm/proc-arm720.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm720.S 2011-11-17 15:36:08.501969838 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm720.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm720.S ++++ b/arch/arm/mm/proc-arm720.S @@ -101,6 +101,7 @@ ENTRY(cpu_arm720_set_pte_ext) * Params : r0 = address to jump to * Notes : This sets up everything for a reset @@ -1827,10 +1663,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm720.S __CPUINIT -Index: linux-3.1.1/arch/arm/mm/proc-arm740.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm740.S 2011-11-17 15:36:08.445970409 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm740.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm740.S ++++ b/arch/arm/mm/proc-arm740.S @@ -49,6 +49,7 @@ ENTRY(cpu_arm740_proc_fin) * Params : r0 = address to jump to * Notes : This sets up everything for a reset @@ -1848,10 +1682,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm740.S __CPUINIT -Index: linux-3.1.1/arch/arm/mm/proc-arm7tdmi.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm7tdmi.S 2011-11-17 15:36:08.485970001 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm7tdmi.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm7tdmi.S ++++ b/arch/arm/mm/proc-arm7tdmi.S @@ -45,8 +45,11 @@ ENTRY(cpu_arm7tdmi_proc_fin) * Params : loc(r0) address to jump to * Purpose : Sets up everything for a reset and jump to the location for soft reset. @@ -1864,10 +1696,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm7tdmi.S __CPUINIT -Index: linux-3.1.1/arch/arm/mm/proc-arm920.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm920.S 2011-11-17 15:36:08.493969920 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm920.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm920.S ++++ b/arch/arm/mm/proc-arm920.S @@ -85,6 +85,7 @@ ENTRY(cpu_arm920_proc_fin) * loc: location to jump to for soft reset */ @@ -1885,10 +1715,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm920.S /* * cpu_arm920_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm922.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm922.S 2011-11-17 15:36:08.549969348 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm922.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm922.S ++++ b/arch/arm/mm/proc-arm922.S @@ -87,6 +87,7 @@ ENTRY(cpu_arm922_proc_fin) * loc: location to jump to for soft reset */ @@ -1906,10 +1734,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm922.S /* * cpu_arm922_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm925.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm925.S 2011-11-17 15:36:08.509969756 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm925.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm925.S ++++ b/arch/arm/mm/proc-arm925.S @@ -108,6 +108,7 @@ ENTRY(cpu_arm925_proc_fin) * loc: location to jump to for soft reset */ @@ -1927,10 +1753,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm925.S mov ip, #0 mcr p15, 0, ip, c7, c7, 0 @ invalidate I,D caches -Index: linux-3.1.1/arch/arm/mm/proc-arm926.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm926.S 2011-11-17 15:36:08.497969879 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm926.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm926.S ++++ b/arch/arm/mm/proc-arm926.S @@ -77,6 +77,7 @@ ENTRY(cpu_arm926_proc_fin) * loc: location to jump to for soft reset */ @@ -1948,10 +1772,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm926.S /* * cpu_arm926_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm940.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm940.S 2011-11-17 15:36:08.457970287 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm940.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm940.S ++++ b/arch/arm/mm/proc-arm940.S @@ -48,6 +48,7 @@ ENTRY(cpu_arm940_proc_fin) * Params : r0 = address to jump to * Notes : This sets up everything for a reset @@ -1969,10 +1791,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm940.S /* * cpu_arm940_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm946.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm946.S 2011-11-17 15:36:08.585968981 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm946.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm946.S ++++ b/arch/arm/mm/proc-arm946.S @@ -55,6 +55,7 @@ ENTRY(cpu_arm946_proc_fin) * Params : r0 = address to jump to * Notes : This sets up everything for a reset @@ -1990,10 +1810,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm946.S /* * cpu_arm946_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-arm9tdmi.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-arm9tdmi.S 2011-11-17 15:36:08.441970450 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-arm9tdmi.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-arm9tdmi.S ++++ b/arch/arm/mm/proc-arm9tdmi.S @@ -45,8 +45,11 @@ ENTRY(cpu_arm9tdmi_proc_fin) * Params : loc(r0) address to jump to * Purpose : Sets up everything for a reset and jump to the location for soft reset. @@ -2006,10 +1824,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-arm9tdmi.S __CPUINIT -Index: linux-3.1.1/arch/arm/mm/proc-fa526.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-fa526.S 2011-11-17 15:36:08.553969308 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-fa526.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-fa526.S ++++ b/arch/arm/mm/proc-fa526.S @@ -57,6 +57,7 @@ ENTRY(cpu_fa526_proc_fin) * loc: location to jump to for soft reset */ @@ -2027,10 +1843,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-fa526.S /* * cpu_fa526_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-feroceon.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-feroceon.S 2011-11-17 15:36:08.481970042 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-feroceon.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-feroceon.S ++++ b/arch/arm/mm/proc-feroceon.S @@ -98,6 +98,7 @@ ENTRY(cpu_feroceon_proc_fin) * loc: location to jump to for soft reset */ @@ -2048,10 +1862,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-feroceon.S /* * cpu_feroceon_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-mohawk.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-mohawk.S 2011-11-17 15:36:08.473970124 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-mohawk.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-mohawk.S ++++ b/arch/arm/mm/proc-mohawk.S @@ -69,6 +69,7 @@ ENTRY(cpu_mohawk_proc_fin) * (same as arm926) */ @@ -2069,10 +1881,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-mohawk.S /* * cpu_mohawk_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-sa110.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-sa110.S 2011-11-17 15:36:08.525969593 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-sa110.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-sa110.S ++++ b/arch/arm/mm/proc-sa110.S @@ -62,6 +62,7 @@ ENTRY(cpu_sa110_proc_fin) * loc: location to jump to for soft reset */ @@ -2090,10 +1900,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-sa110.S /* * cpu_sa110_do_idle(type) -Index: linux-3.1.1/arch/arm/mm/proc-sa1100.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-sa1100.S 2011-11-17 15:36:08.513969716 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-sa1100.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-sa1100.S ++++ b/arch/arm/mm/proc-sa1100.S @@ -70,6 +70,7 @@ ENTRY(cpu_sa1100_proc_fin) * loc: location to jump to for soft reset */ @@ -2111,10 +1919,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-sa1100.S /* * cpu_sa1100_do_idle(type) -Index: linux-3.1.1/arch/arm/mm/proc-v6.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-v6.S 2011-11-17 15:36:08.469970164 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-v6.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-v6.S ++++ b/arch/arm/mm/proc-v6.S @@ -55,6 +55,7 @@ ENTRY(cpu_v6_proc_fin) * - loc - location to jump to for soft reset */ @@ -2132,10 +1938,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-v6.S /* * cpu_v6_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-v7.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-v7.S 2011-11-17 15:36:08.461970246 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-v7.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S @@ -63,6 +63,7 @@ ENDPROC(cpu_v7_proc_fin) * caches disabled. */ @@ -2152,10 +1956,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-v7.S /* * cpu_v7_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-xsc3.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-xsc3.S 2011-11-17 15:36:08.561969226 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-xsc3.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-xsc3.S ++++ b/arch/arm/mm/proc-xsc3.S @@ -105,6 +105,7 @@ ENTRY(cpu_xsc3_proc_fin) * loc: location to jump to for soft reset */ @@ -2173,10 +1975,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-xsc3.S /* * cpu_xsc3_do_idle() -Index: linux-3.1.1/arch/arm/mm/proc-xscale.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/mm/proc-xscale.S 2011-11-17 15:36:08.565969185 +0100 -+++ linux-3.1.1/arch/arm/mm/proc-xscale.S 2011-11-17 15:36:47.129577613 +0100 +--- a/arch/arm/mm/proc-xscale.S ++++ b/arch/arm/mm/proc-xscale.S @@ -142,6 +142,7 @@ ENTRY(cpu_xscale_proc_fin) * Beware PXA270 erratum E7. */ @@ -2194,10 +1994,8 @@ Index: linux-3.1.1/arch/arm/mm/proc-xscale.S /* * cpu_xscale_do_idle() -Index: linux-3.1.1/arch/arm/plat-omap/include/plat/irqs.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-11-17 15:36:08.381971062 +0100 -+++ linux-3.1.1/arch/arm/plat-omap/include/plat/irqs.h 2011-11-17 15:36:47.133577572 +0100 +--- a/arch/arm/plat-omap/include/plat/irqs.h ++++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -438,16 +438,6 @@ #ifndef __ASSEMBLY__ @@ -2215,10 +2013,8 @@ Index: linux-3.1.1/arch/arm/plat-omap/include/plat/irqs.h #endif #include <mach/hardware.h> -Index: linux-3.1.1/arch/arm/plat-omap/include/plat/system.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/plat-omap/include/plat/system.h 2011-11-17 15:36:08.393970940 +0100 -+++ linux-3.1.1/arch/arm/plat-omap/include/plat/system.h 2011-11-17 15:36:47.133577572 +0100 +--- a/arch/arm/plat-omap/include/plat/system.h ++++ b/arch/arm/plat-omap/include/plat/system.h @@ -12,6 +12,4 @@ static inline void arch_idle(void) cpu_do_idle(); } @@ -2226,10 +2022,8 @@ Index: linux-3.1.1/arch/arm/plat-omap/include/plat/system.h -extern void (*arch_reset)(char, const char *); - #endif -Index: linux-3.1.1/include/asm-generic/vmlinux.lds.h -=================================================================== ---- linux-3.1.1.orig/include/asm-generic/vmlinux.lds.h 2011-11-17 15:36:08.621968614 +0100 -+++ linux-3.1.1/include/asm-generic/vmlinux.lds.h 2011-11-17 15:36:47.133577572 +0100 +--- a/include/asm-generic/vmlinux.lds.h ++++ b/include/asm-generic/vmlinux.lds.h @@ -447,6 +447,12 @@ *(.kprobes.text) \ VMLINUX_SYMBOL(__kprobes_text_end) = .; @@ -2243,10 +2037,8 @@ Index: linux-3.1.1/include/asm-generic/vmlinux.lds.h #define ENTRY_TEXT \ ALIGN_FUNCTION(); \ VMLINUX_SYMBOL(__entry_text_start) = .; \ -Index: linux-3.1.1/arch/arm/kernel/sleep.S -=================================================================== ---- linux-3.1.1.orig/arch/arm/kernel/sleep.S 2011-11-17 15:36:08.405970817 +0100 -+++ linux-3.1.1/arch/arm/kernel/sleep.S 2011-11-17 15:36:47.133577572 +0100 +--- a/arch/arm/kernel/sleep.S ++++ b/arch/arm/kernel/sleep.S @@ -85,12 +85,14 @@ ENDPROC(cpu_resume_mmu) .ltorg .align 5 @@ -2262,10 +2054,8 @@ Index: linux-3.1.1/arch/arm/kernel/sleep.S cpu_resume_after_mmu: str r5, [r2, r4, lsl #2] @ restore old mapping mcr p15, 0, r0, c1, c0, 0 @ turn on D-cache -Index: linux-3.1.1/arch/arm/mach-omap2/io.c -=================================================================== ---- linux-3.1.1.orig/arch/arm/mach-omap2/io.c 2011-11-17 15:36:08.053974408 +0100 -+++ linux-3.1.1/arch/arm/mach-omap2/io.c 2011-11-17 15:36:47.133577572 +0100 +--- a/arch/arm/mach-omap2/io.c ++++ b/arch/arm/mach-omap2/io.c @@ -36,7 +36,7 @@ #include "clock3xxx.h" #include "clock44xx.h" @@ -2275,10 +2065,8 @@ Index: linux-3.1.1/arch/arm/mach-omap2/io.c #include <plat/omap-pm.h> #include "powerdomain.h" -Index: linux-3.1.1/arch/arm/plat-omap/include/plat/common.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/plat-omap/include/plat/common.h 2011-11-17 15:36:08.385971021 +0100 -+++ linux-3.1.1/arch/arm/plat-omap/include/plat/common.h 2011-11-17 15:36:47.133577572 +0100 +--- a/arch/arm/plat-omap/include/plat/common.h ++++ b/arch/arm/plat-omap/include/plat/common.h @@ -27,78 +27,11 @@ #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H #define __ARCH_ARM_MACH_OMAP_COMMON_H @@ -2358,10 +2146,8 @@ Index: linux-3.1.1/arch/arm/plat-omap/include/plat/common.h -extern struct device *omap4_get_dsp_device(void); - #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ -Index: linux-3.1.1/arch/arm/plat-omap/include/plat/io.h -=================================================================== ---- linux-3.1.1.orig/arch/arm/plat-omap/include/plat/io.h 2011-11-17 15:36:08.401970858 +0100 -+++ linux-3.1.1/arch/arm/plat-omap/include/plat/io.h 2011-11-17 15:36:47.133577572 +0100 +--- a/arch/arm/plat-omap/include/plat/io.h ++++ b/arch/arm/plat-omap/include/plat/io.h @@ -258,48 +258,9 @@ struct omap_sdrc_params; extern void omap1_map_common_io(void); diff --git a/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch b/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch index 6793a3c60..86f2f770e 100644 --- a/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch +++ b/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch @@ -1,7 +1,5 @@ -Index: linux-3.1.1/drivers/cbus/retu.c -=================================================================== ---- linux-3.1.1.orig/drivers/cbus/retu.c 2011-11-17 23:23:53.542699149 +0100 -+++ linux-3.1.1/drivers/cbus/retu.c 2011-11-17 23:23:55.830689859 +0100 +--- a/drivers/cbus/retu.c ++++ b/drivers/cbus/retu.c @@ -53,9 +53,6 @@ struct retu { int irq; @@ -70,10 +68,8 @@ Index: linux-3.1.1/drivers/cbus/retu.c irq_set_nested_thread(irq, 1); retu_irq_setup(irq); } -Index: linux-3.1.1/drivers/cbus/tahvo.c -=================================================================== ---- linux-3.1.1.orig/drivers/cbus/tahvo.c 2011-11-17 23:23:54.358695836 +0100 -+++ linux-3.1.1/drivers/cbus/tahvo.c 2011-11-17 23:23:55.830689859 +0100 +--- a/drivers/cbus/tahvo.c ++++ b/drivers/cbus/tahvo.c @@ -48,11 +48,9 @@ struct tahvo { int irq_end; int irq; diff --git a/target/linux/omap24xx/patches-3.1/254-cbus-retu-tahvo-irq-mask-init-fix.patch b/target/linux/omap24xx/patches-3.1/254-cbus-retu-tahvo-irq-mask-init-fix.patch index a3802cb2c..a1be6b793 100644 --- a/target/linux/omap24xx/patches-3.1/254-cbus-retu-tahvo-irq-mask-init-fix.patch +++ b/target/linux/omap24xx/patches-3.1/254-cbus-retu-tahvo-irq-mask-init-fix.patch @@ -1,7 +1,5 @@ -Index: linux-3.1.1/drivers/cbus/retu.c -=================================================================== ---- linux-3.1.1.orig/drivers/cbus/retu.c 2011-11-17 23:09:26.498214061 +0100 -+++ linux-3.1.1/drivers/cbus/retu.c 2011-11-17 23:15:50.280659655 +0100 +--- a/drivers/cbus/retu.c ++++ b/drivers/cbus/retu.c @@ -451,7 +451,8 @@ static int __devinit retu_probe(struct p (rev >> 4) & 0x07, rev & 0x0f); @@ -12,10 +10,8 @@ Index: linux-3.1.1/drivers/cbus/retu.c ret = request_threaded_irq(retu->irq, NULL, retu_irq_handler, IRQF_ONESHOT, "retu", retu); -Index: linux-3.1.1/drivers/cbus/tahvo.c -=================================================================== ---- linux-3.1.1.orig/drivers/cbus/tahvo.c 2011-11-17 23:15:46.684674232 +0100 -+++ linux-3.1.1/drivers/cbus/tahvo.c 2011-11-17 23:15:50.280659655 +0100 +--- a/drivers/cbus/tahvo.c ++++ b/drivers/cbus/tahvo.c @@ -346,7 +346,8 @@ static int __devinit tahvo_probe(struct (rev >> 4) & 0x0f, rev & 0x0f); diff --git a/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch b/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch index 161698ddd..d7eece605 100644 --- a/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch +++ b/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch @@ -1,7 +1,5 @@ -Index: linux-3.1.1/drivers/video/omap/omapfb_main.c -=================================================================== ---- linux-3.1.1.orig/drivers/video/omap/omapfb_main.c 2011-11-11 21:19:27.000000000 +0100 -+++ linux-3.1.1/drivers/video/omap/omapfb_main.c 2011-11-16 23:10:16.554325659 +0100 +--- a/drivers/video/omap/omapfb_main.c ++++ b/drivers/video/omap/omapfb_main.c @@ -419,10 +419,10 @@ static void set_fb_fix(struct fb_info *f fbi->screen_base = rg->vaddr; @@ -28,10 +26,8 @@ Index: linux-3.1.1/drivers/video/omap/omapfb_main.c } } } -Index: linux-3.1.1/drivers/video/fbmem.c -=================================================================== ---- linux-3.1.1.orig/drivers/video/fbmem.c 2011-11-11 21:19:27.000000000 +0100 -+++ linux-3.1.1/drivers/video/fbmem.c 2011-11-16 23:20:56.055698968 +0100 +--- a/drivers/video/fbmem.c ++++ b/drivers/video/fbmem.c @@ -1369,8 +1369,10 @@ fb_mmap(struct file *file, struct vm_are } diff --git a/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch b/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch index 99c174927..09f14b756 100644 --- a/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch +++ b/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch @@ -1881,7 +1881,7 @@ #endif /* __DRIVERS_CBUS_CBUS_H */ --- a/drivers/cbus/retu.c +++ b/drivers/cbus/retu.c -@@ -417,6 +417,11 @@ static int retu_allocate_children(struct +@@ -399,6 +399,11 @@ static int retu_allocate_children(struct if (!child) return -ENOMEM; @@ -1895,7 +1895,7 @@ --- a/drivers/cbus/tahvo.c +++ b/drivers/cbus/tahvo.c -@@ -131,6 +131,7 @@ void tahvo_set_clear_reg_bits(struct dev +@@ -129,6 +129,7 @@ void tahvo_set_clear_reg_bits(struct dev __tahvo_write_reg(tahvo, reg, w); mutex_unlock(&tahvo->mutex); } @@ -1903,7 +1903,7 @@ static irqreturn_t tahvo_irq_handler(int irq, void *_tahvo) { -@@ -307,6 +308,11 @@ static int tahvo_allocate_children(struc +@@ -292,6 +293,11 @@ static int tahvo_allocate_children(struc if (!child) return -ENOMEM; |