diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:30:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:30:58 -0400 |
commit | b693ffe67363119199ffe9f2fac9119475968e8a (patch) | |
tree | 3b1e6ab0720bbfcbb3a4d58cd3a13750f830ffe8 /arch/sh | |
parent | 14408c4f4172eafc26ff52bebb7a8ab85b1c5492 (diff) | |
parent | 4eb00c9f92202a759aadbce73ea4a947b639b5e6 (diff) |
Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
i2c: fix i2c-sh_mobile timing issues
sh64: resume_kernel fix for kernel oops built with CONFIG_BKL_PREEMPT=y.
sh: resume_kernel fix for kernel oops built with CONFIG_BKL_PREEMPT=y.
sh: fix semtimedop syscall
sh: update AP325RXA defconfig
sh: update Migo-R defconfig
sh: fix platform_resource_setup_memory() section mismatch
sh: fix kexec entry point for crash kernels
sh: crash kernel resource fix
sh: fix ptrace_64.c:user_disable_single_step()
sh64: re-add the __strnlen_user() prototype
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/configs/ap325rxa_defconfig | 22 | ||||
-rw-r--r-- | arch/sh/configs/migor_defconfig | 21 | ||||
-rw-r--r-- | arch/sh/include/asm/uaccess_64.h | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 14 | ||||
-rw-r--r-- | arch/sh/kernel/entry-common.S | 27 | ||||
-rw-r--r-- | arch/sh/kernel/machine_kexec.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/ptrace_64.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/setup.c | 6 | ||||
-rw-r--r-- | arch/sh/kernel/sys_sh.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/consistent.c | 6 |
10 files changed, 42 insertions, 62 deletions
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig index 29926a9b9ce2..851c870adf3b 100644 --- a/arch/sh/configs/ap325rxa_defconfig +++ b/arch/sh/configs/ap325rxa_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Wed Jul 30 01:18:59 2008 | 4 | # Tue Aug 26 14:21:17 2008 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -11,6 +11,7 @@ CONFIG_GENERIC_BUG=y | |||
11 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
12 | CONFIG_GENERIC_HWEIGHT=y | 12 | CONFIG_GENERIC_HWEIGHT=y |
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
14 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
16 | CONFIG_GENERIC_TIME=y | 17 | CONFIG_GENERIC_TIME=y |
@@ -20,7 +21,6 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
22 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 23 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
23 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
25 | 25 | ||
26 | # | 26 | # |
@@ -58,7 +58,6 @@ CONFIG_SYSCTL=y | |||
58 | CONFIG_EMBEDDED=y | 58 | CONFIG_EMBEDDED=y |
59 | CONFIG_UID16=y | 59 | CONFIG_UID16=y |
60 | CONFIG_SYSCTL_SYSCALL=y | 60 | CONFIG_SYSCTL_SYSCALL=y |
61 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
62 | # CONFIG_KALLSYMS is not set | 61 | # CONFIG_KALLSYMS is not set |
63 | CONFIG_HOTPLUG=y | 62 | CONFIG_HOTPLUG=y |
64 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
@@ -89,6 +88,7 @@ CONFIG_HAVE_OPROFILE=y | |||
89 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | 88 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set |
90 | CONFIG_HAVE_CLK=y | 89 | CONFIG_HAVE_CLK=y |
91 | CONFIG_PROC_PAGE_MONITOR=y | 90 | CONFIG_PROC_PAGE_MONITOR=y |
91 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
92 | CONFIG_SLABINFO=y | 92 | CONFIG_SLABINFO=y |
93 | CONFIG_RT_MUTEXES=y | 93 | CONFIG_RT_MUTEXES=y |
94 | # CONFIG_TINY_SHMEM is not set | 94 | # CONFIG_TINY_SHMEM is not set |
@@ -261,9 +261,10 @@ CONFIG_HZ_250=y | |||
261 | # CONFIG_HZ_300 is not set | 261 | # CONFIG_HZ_300 is not set |
262 | # CONFIG_HZ_1000 is not set | 262 | # CONFIG_HZ_1000 is not set |
263 | CONFIG_HZ=250 | 263 | CONFIG_HZ=250 |
264 | # CONFIG_SCHED_HRTICK is not set | 264 | CONFIG_SCHED_HRTICK=y |
265 | # CONFIG_KEXEC is not set | 265 | # CONFIG_KEXEC is not set |
266 | # CONFIG_CRASH_DUMP is not set | 266 | # CONFIG_CRASH_DUMP is not set |
267 | CONFIG_SECCOMP=y | ||
267 | # CONFIG_PREEMPT_NONE is not set | 268 | # CONFIG_PREEMPT_NONE is not set |
268 | # CONFIG_PREEMPT_VOLUNTARY is not set | 269 | # CONFIG_PREEMPT_VOLUNTARY is not set |
269 | CONFIG_PREEMPT=y | 270 | CONFIG_PREEMPT=y |
@@ -289,10 +290,6 @@ CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp" | |||
289 | # | 290 | # |
290 | CONFIG_BINFMT_ELF=y | 291 | CONFIG_BINFMT_ELF=y |
291 | # CONFIG_BINFMT_MISC is not set | 292 | # CONFIG_BINFMT_MISC is not set |
292 | |||
293 | # | ||
294 | # Networking | ||
295 | # | ||
296 | CONFIG_NET=y | 293 | CONFIG_NET=y |
297 | 294 | ||
298 | # | 295 | # |
@@ -647,6 +644,7 @@ CONFIG_SSB_POSSIBLE=y | |||
647 | # CONFIG_MFD_CORE is not set | 644 | # CONFIG_MFD_CORE is not set |
648 | # CONFIG_MFD_SM501 is not set | 645 | # CONFIG_MFD_SM501 is not set |
649 | # CONFIG_HTC_PASIC3 is not set | 646 | # CONFIG_HTC_PASIC3 is not set |
647 | # CONFIG_MFD_TMIO is not set | ||
650 | 648 | ||
651 | # | 649 | # |
652 | # Multimedia devices | 650 | # Multimedia devices |
@@ -690,7 +688,10 @@ CONFIG_DUMMY_CONSOLE=y | |||
690 | # CONFIG_ACCESSIBILITY is not set | 688 | # CONFIG_ACCESSIBILITY is not set |
691 | # CONFIG_RTC_CLASS is not set | 689 | # CONFIG_RTC_CLASS is not set |
692 | # CONFIG_DMADEVICES is not set | 690 | # CONFIG_DMADEVICES is not set |
693 | # CONFIG_UIO is not set | 691 | CONFIG_UIO=y |
692 | # CONFIG_UIO_PDRV is not set | ||
693 | CONFIG_UIO_PDRV_GENIRQ=y | ||
694 | # CONFIG_UIO_SMX is not set | ||
694 | 695 | ||
695 | # | 696 | # |
696 | # File systems | 697 | # File systems |
@@ -854,6 +855,7 @@ CONFIG_FRAME_WARN=1024 | |||
854 | # CONFIG_DEBUG_KERNEL is not set | 855 | # CONFIG_DEBUG_KERNEL is not set |
855 | # CONFIG_DEBUG_BUGVERBOSE is not set | 856 | # CONFIG_DEBUG_BUGVERBOSE is not set |
856 | # CONFIG_DEBUG_MEMORY_INIT is not set | 857 | # CONFIG_DEBUG_MEMORY_INIT is not set |
858 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
857 | # CONFIG_SAMPLES is not set | 859 | # CONFIG_SAMPLES is not set |
858 | # CONFIG_SH_STANDARD_BIOS is not set | 860 | # CONFIG_SH_STANDARD_BIOS is not set |
859 | # CONFIG_EARLY_SCIF_CONSOLE is not set | 861 | # CONFIG_EARLY_SCIF_CONSOLE is not set |
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index c4b3e1d8950d..4f8b1974f2c7 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Wed Jul 30 01:44:41 2008 | 4 | # Tue Aug 26 14:18:17 2008 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -11,6 +11,7 @@ CONFIG_GENERIC_BUG=y | |||
11 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
12 | CONFIG_GENERIC_HWEIGHT=y | 12 | CONFIG_GENERIC_HWEIGHT=y |
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
14 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
16 | CONFIG_GENERIC_TIME=y | 17 | CONFIG_GENERIC_TIME=y |
@@ -21,7 +22,6 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 23 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
23 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 24 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
25 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 25 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
26 | 26 | ||
27 | # | 27 | # |
@@ -87,6 +87,7 @@ CONFIG_HAVE_OPROFILE=y | |||
87 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | 87 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set |
88 | CONFIG_HAVE_CLK=y | 88 | CONFIG_HAVE_CLK=y |
89 | CONFIG_PROC_PAGE_MONITOR=y | 89 | CONFIG_PROC_PAGE_MONITOR=y |
90 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
90 | CONFIG_SLABINFO=y | 91 | CONFIG_SLABINFO=y |
91 | CONFIG_RT_MUTEXES=y | 92 | CONFIG_RT_MUTEXES=y |
92 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
@@ -270,6 +271,7 @@ CONFIG_HZ=250 | |||
270 | # CONFIG_SCHED_HRTICK is not set | 271 | # CONFIG_SCHED_HRTICK is not set |
271 | # CONFIG_KEXEC is not set | 272 | # CONFIG_KEXEC is not set |
272 | # CONFIG_CRASH_DUMP is not set | 273 | # CONFIG_CRASH_DUMP is not set |
274 | CONFIG_SECCOMP=y | ||
273 | CONFIG_PREEMPT_NONE=y | 275 | CONFIG_PREEMPT_NONE=y |
274 | # CONFIG_PREEMPT_VOLUNTARY is not set | 276 | # CONFIG_PREEMPT_VOLUNTARY is not set |
275 | # CONFIG_PREEMPT is not set | 277 | # CONFIG_PREEMPT is not set |
@@ -294,10 +296,6 @@ CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on" | |||
294 | # | 296 | # |
295 | CONFIG_BINFMT_ELF=y | 297 | CONFIG_BINFMT_ELF=y |
296 | # CONFIG_BINFMT_MISC is not set | 298 | # CONFIG_BINFMT_MISC is not set |
297 | |||
298 | # | ||
299 | # Networking | ||
300 | # | ||
301 | CONFIG_NET=y | 299 | CONFIG_NET=y |
302 | 300 | ||
303 | # | 301 | # |
@@ -649,6 +647,7 @@ CONFIG_HW_RANDOM=y | |||
649 | CONFIG_I2C=y | 647 | CONFIG_I2C=y |
650 | CONFIG_I2C_BOARDINFO=y | 648 | CONFIG_I2C_BOARDINFO=y |
651 | # CONFIG_I2C_CHARDEV is not set | 649 | # CONFIG_I2C_CHARDEV is not set |
650 | CONFIG_I2C_HELPER_AUTO=y | ||
652 | 651 | ||
653 | # | 652 | # |
654 | # I2C Hardware Bus support | 653 | # I2C Hardware Bus support |
@@ -709,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
709 | # CONFIG_MFD_CORE is not set | 708 | # CONFIG_MFD_CORE is not set |
710 | # CONFIG_MFD_SM501 is not set | 709 | # CONFIG_MFD_SM501 is not set |
711 | # CONFIG_HTC_PASIC3 is not set | 710 | # CONFIG_HTC_PASIC3 is not set |
711 | # CONFIG_MFD_TMIO is not set | ||
712 | 712 | ||
713 | # | 713 | # |
714 | # Multimedia devices | 714 | # Multimedia devices |
@@ -755,6 +755,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
755 | # CONFIG_USB is not set | 755 | # CONFIG_USB is not set |
756 | # CONFIG_USB_OTG_WHITELIST is not set | 756 | # CONFIG_USB_OTG_WHITELIST is not set |
757 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 757 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
758 | # CONFIG_USB_MUSB_HDRC is not set | ||
759 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
758 | 760 | ||
759 | # | 761 | # |
760 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 762 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -842,7 +844,10 @@ CONFIG_RTC_DRV_RS5C372=y | |||
842 | # | 844 | # |
843 | CONFIG_RTC_DRV_SH=y | 845 | CONFIG_RTC_DRV_SH=y |
844 | # CONFIG_DMADEVICES is not set | 846 | # CONFIG_DMADEVICES is not set |
845 | # CONFIG_UIO is not set | 847 | CONFIG_UIO=y |
848 | # CONFIG_UIO_PDRV is not set | ||
849 | CONFIG_UIO_PDRV_GENIRQ=y | ||
850 | # CONFIG_UIO_SMX is not set | ||
846 | 851 | ||
847 | # | 852 | # |
848 | # File systems | 853 | # File systems |
diff --git a/arch/sh/include/asm/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h index 81b3d515fcb3..5580fd471003 100644 --- a/arch/sh/include/asm/uaccess_64.h +++ b/arch/sh/include/asm/uaccess_64.h | |||
@@ -76,4 +76,6 @@ extern long __put_user_asm_l(void *, long); | |||
76 | extern long __put_user_asm_q(void *, long); | 76 | extern long __put_user_asm_q(void *, long); |
77 | extern void __put_user_unknown(void); | 77 | extern void __put_user_unknown(void); |
78 | 78 | ||
79 | extern long __strnlen_user(const char *__s, long __n); | ||
80 | |||
79 | #endif /* __ASM_SH_UACCESS_64_H */ | 81 | #endif /* __ASM_SH_UACCESS_64_H */ |
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index 04c7da968146..e640c63d5811 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S | |||
@@ -2,7 +2,7 @@ | |||
2 | * arch/sh/kernel/cpu/sh5/entry.S | 2 | * arch/sh/kernel/cpu/sh5/entry.S |
3 | * | 3 | * |
4 | * Copyright (C) 2000, 2001 Paolo Alberelli | 4 | * Copyright (C) 2000, 2001 Paolo Alberelli |
5 | * Copyright (C) 2004 - 2007 Paul Mundt | 5 | * Copyright (C) 2004 - 2008 Paul Mundt |
6 | * Copyright (C) 2003, 2004 Richard Curnow | 6 | * Copyright (C) 2003, 2004 Richard Curnow |
7 | * | 7 | * |
8 | * This file is subject to the terms and conditions of the GNU General Public | 8 | * This file is subject to the terms and conditions of the GNU General Public |
@@ -923,6 +923,8 @@ ret_from_exception: | |||
923 | blink tr0, ZERO | 923 | blink tr0, ZERO |
924 | 924 | ||
925 | resume_kernel: | 925 | resume_kernel: |
926 | CLI() | ||
927 | |||
926 | pta restore_all, tr0 | 928 | pta restore_all, tr0 |
927 | 929 | ||
928 | getcon KCR0, r6 | 930 | getcon KCR0, r6 |
@@ -939,19 +941,11 @@ need_resched: | |||
939 | andi r7, 0xf0, r7 | 941 | andi r7, 0xf0, r7 |
940 | bne r7, ZERO, tr0 | 942 | bne r7, ZERO, tr0 |
941 | 943 | ||
942 | movi ((PREEMPT_ACTIVE >> 16) & 65535), r8 | 944 | movi preempt_schedule_irq, r7 |
943 | shori (PREEMPT_ACTIVE & 65535), r8 | ||
944 | st.l r6, TI_PRE_COUNT, r8 | ||
945 | |||
946 | STI() | ||
947 | movi schedule, r7 | ||
948 | ori r7, 1, r7 | 945 | ori r7, 1, r7 |
949 | ptabs r7, tr1 | 946 | ptabs r7, tr1 |
950 | blink tr1, LINK | 947 | blink tr1, LINK |
951 | 948 | ||
952 | st.l r6, TI_PRE_COUNT, ZERO | ||
953 | CLI() | ||
954 | |||
955 | pta need_resched, tr1 | 949 | pta need_resched, tr1 |
956 | blink tr1, ZERO | 950 | blink tr1, ZERO |
957 | #endif | 951 | #endif |
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 0bc17def55a7..efbb4268875e 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
@@ -92,6 +92,7 @@ ENTRY(ret_from_irq) | |||
92 | bra resume_userspace | 92 | bra resume_userspace |
93 | nop | 93 | nop |
94 | ENTRY(resume_kernel) | 94 | ENTRY(resume_kernel) |
95 | cli | ||
95 | mov.l @(TI_PRE_COUNT,r8), r0 ! current_thread_info->preempt_count | 96 | mov.l @(TI_PRE_COUNT,r8), r0 ! current_thread_info->preempt_count |
96 | tst r0, r0 | 97 | tst r0, r0 |
97 | bf noresched | 98 | bf noresched |
@@ -105,28 +106,9 @@ need_resched: | |||
105 | and #0xf0, r0 ! interrupts off (exception path)? | 106 | and #0xf0, r0 ! interrupts off (exception path)? |
106 | cmp/eq #0xf0, r0 | 107 | cmp/eq #0xf0, r0 |
107 | bt noresched | 108 | bt noresched |
108 | |||
109 | mov.l 1f, r0 | ||
110 | mov.l r0, @(TI_PRE_COUNT,r8) | ||
111 | |||
112 | #ifdef CONFIG_TRACE_IRQFLAGS | ||
113 | mov.l 3f, r0 | 109 | mov.l 3f, r0 |
114 | jsr @r0 | 110 | jsr @r0 ! call preempt_schedule_irq |
115 | nop | ||
116 | #endif | ||
117 | sti | ||
118 | mov.l 2f, r0 | ||
119 | jsr @r0 | ||
120 | nop | ||
121 | mov #0, r0 | ||
122 | mov.l r0, @(TI_PRE_COUNT,r8) | ||
123 | cli | ||
124 | #ifdef CONFIG_TRACE_IRQFLAGS | ||
125 | mov.l 4f, r0 | ||
126 | jsr @r0 | ||
127 | nop | 111 | nop |
128 | #endif | ||
129 | |||
130 | bra need_resched | 112 | bra need_resched |
131 | nop | 113 | nop |
132 | 114 | ||
@@ -137,10 +119,7 @@ noresched: | |||
137 | .align 2 | 119 | .align 2 |
138 | 1: .long PREEMPT_ACTIVE | 120 | 1: .long PREEMPT_ACTIVE |
139 | 2: .long schedule | 121 | 2: .long schedule |
140 | #ifdef CONFIG_TRACE_IRQFLAGS | 122 | 3: .long preempt_schedule_irq |
141 | 3: .long trace_hardirqs_on | ||
142 | 4: .long trace_hardirqs_off | ||
143 | #endif | ||
144 | #endif | 123 | #endif |
145 | 124 | ||
146 | ENTRY(resume_userspace) | 125 | ENTRY(resume_userspace) |
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c index 4703dff174d5..94df56b0d1f6 100644 --- a/arch/sh/kernel/machine_kexec.c +++ b/arch/sh/kernel/machine_kexec.c | |||
@@ -102,7 +102,7 @@ void machine_kexec(struct kimage *image) | |||
102 | 102 | ||
103 | /* now call it */ | 103 | /* now call it */ |
104 | rnk = (relocate_new_kernel_t) reboot_code_buffer; | 104 | rnk = (relocate_new_kernel_t) reboot_code_buffer; |
105 | (*rnk)(page_list, reboot_code_buffer, image->start, vbr_reg); | 105 | (*rnk)(page_list, reboot_code_buffer, P2SEGADDR(image->start), vbr_reg); |
106 | } | 106 | } |
107 | 107 | ||
108 | void arch_crash_save_vmcoreinfo(void) | 108 | void arch_crash_save_vmcoreinfo(void) |
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c index 5922edd416db..9c6424892bd3 100644 --- a/arch/sh/kernel/ptrace_64.c +++ b/arch/sh/kernel/ptrace_64.c | |||
@@ -131,6 +131,8 @@ void user_enable_single_step(struct task_struct *child) | |||
131 | 131 | ||
132 | void user_disable_single_step(struct task_struct *child) | 132 | void user_disable_single_step(struct task_struct *child) |
133 | { | 133 | { |
134 | struct pt_regs *regs = child->thread.uregs; | ||
135 | |||
134 | regs->sr &= ~SR_SSTEP; | 136 | regs->sr &= ~SR_SSTEP; |
135 | } | 137 | } |
136 | 138 | ||
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index a35207655e7b..de832056bf1b 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -171,6 +171,7 @@ static void __init reserve_crashkernel(void) | |||
171 | (unsigned long)(free_mem >> 20)); | 171 | (unsigned long)(free_mem >> 20)); |
172 | crashk_res.start = crash_base; | 172 | crashk_res.start = crash_base; |
173 | crashk_res.end = crash_base + crash_size - 1; | 173 | crashk_res.end = crash_base + crash_size - 1; |
174 | insert_resource(&iomem_resource, &crashk_res); | ||
174 | } | 175 | } |
175 | } | 176 | } |
176 | #else | 177 | #else |
@@ -204,11 +205,6 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, | |||
204 | request_resource(res, &data_resource); | 205 | request_resource(res, &data_resource); |
205 | request_resource(res, &bss_resource); | 206 | request_resource(res, &bss_resource); |
206 | 207 | ||
207 | #ifdef CONFIG_KEXEC | ||
208 | if (crashk_res.start != crashk_res.end) | ||
209 | request_resource(res, &crashk_res); | ||
210 | #endif | ||
211 | |||
212 | add_active_range(nid, start_pfn, end_pfn); | 208 | add_active_range(nid, start_pfn, end_pfn); |
213 | } | 209 | } |
214 | 210 | ||
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 59cd2859ce9b..9061b86d73fa 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c | |||
@@ -170,7 +170,7 @@ asmlinkage int sys_ipc(uint call, int first, int second, | |||
170 | version = call >> 16; /* hack for backward compatibility */ | 170 | version = call >> 16; /* hack for backward compatibility */ |
171 | call &= 0xffff; | 171 | call &= 0xffff; |
172 | 172 | ||
173 | if (call <= SEMCTL) | 173 | if (call <= SEMTIMEDOP) |
174 | switch (call) { | 174 | switch (call) { |
175 | case SEMOP: | 175 | case SEMOP: |
176 | return sys_semtimedop(first, | 176 | return sys_semtimedop(first, |
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 895bb3f335c7..64b8f7f96f9a 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c | |||
@@ -101,7 +101,7 @@ static int __init memchunk_setup(char *str) | |||
101 | } | 101 | } |
102 | __setup("memchunk.", memchunk_setup); | 102 | __setup("memchunk.", memchunk_setup); |
103 | 103 | ||
104 | static void memchunk_cmdline_override(char *name, unsigned long *sizep) | 104 | static void __init memchunk_cmdline_override(char *name, unsigned long *sizep) |
105 | { | 105 | { |
106 | char *p = boot_command_line; | 106 | char *p = boot_command_line; |
107 | int k = strlen(name); | 107 | int k = strlen(name); |
@@ -118,8 +118,8 @@ static void memchunk_cmdline_override(char *name, unsigned long *sizep) | |||
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | int platform_resource_setup_memory(struct platform_device *pdev, | 121 | int __init platform_resource_setup_memory(struct platform_device *pdev, |
122 | char *name, unsigned long memsize) | 122 | char *name, unsigned long memsize) |
123 | { | 123 | { |
124 | struct resource *r; | 124 | struct resource *r; |
125 | dma_addr_t dma_handle; | 125 | dma_addr_t dma_handle; |