diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-13 14:38:28 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-13 14:38:28 +0000 |
| commit | f1f885a356aaf04e494adbaa3b5457e434f58640 (patch) | |
| tree | e5cb11e1cd143af6f6e6d04cbfe2ee8699505789 /target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch | |
| parent | 6b4b162100ec5ae169583100efa53c6a41cbca7d (diff) | |
kernel: update linux 3.1 to 3.1.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29726 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch')
| -rw-r--r-- | target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch | 14 |
1 files changed, 7 insertions, 7 deletions
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 6da3478dcb..0c26af2ab1 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,6 +1,6 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1876,7 +1876,7 @@ config XIP_PHYS_ADDR +@@ -1888,7 +1888,7 @@ config XIP_PHYS_ADDR config KEXEC bool "Kexec system call (EXPERIMENTAL)" @@ -201,7 +201,7 @@ EXPORT_SYMBOL_GPL(arm_pm_restart); static void do_nothing(void *unused) -@@ -250,7 +274,15 @@ void machine_power_off(void) +@@ -253,7 +277,15 @@ void machine_power_off(void) void machine_restart(char *cmd) { machine_shutdown(); @@ -219,10 +219,10 @@ void __show_regs(struct pt_regs *regs) --- 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; - +@@ -896,8 +896,8 @@ void __init setup_arch(char **cmdline_p) + arm_dma_zone_size = mdesc->dma_zone_size; + } + #endif - if (mdesc->soft_reboot) - reboot_setup("s"); + if (mdesc->restart_mode) @@ -230,7 +230,7 @@ init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext; -@@ -910,6 +910,9 @@ void __init setup_arch(char **cmdline_p) +@@ -916,6 +916,9 @@ void __init setup_arch(char **cmdline_p) paging_init(mdesc); request_standard_resources(mdesc); |