diff options
Diffstat (limited to 'arch/sh64')
-rw-r--r-- | arch/sh64/Kconfig | 4 | ||||
-rw-r--r-- | arch/sh64/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/sh64/mm/fault.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig index 76eb81fba45e..4c3e5334adb3 100644 --- a/arch/sh64/Kconfig +++ b/arch/sh64/Kconfig | |||
@@ -217,6 +217,8 @@ config PREEMPT | |||
217 | bool "Preemptible Kernel (EXPERIMENTAL)" | 217 | bool "Preemptible Kernel (EXPERIMENTAL)" |
218 | depends on EXPERIMENTAL | 218 | depends on EXPERIMENTAL |
219 | 219 | ||
220 | source "mm/Kconfig" | ||
221 | |||
220 | endmenu | 222 | endmenu |
221 | 223 | ||
222 | menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" | 224 | menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" |
@@ -266,6 +268,8 @@ source "fs/Kconfig.binfmt" | |||
266 | 268 | ||
267 | endmenu | 269 | endmenu |
268 | 270 | ||
271 | source "net/Kconfig" | ||
272 | |||
269 | source "drivers/Kconfig" | 273 | source "drivers/Kconfig" |
270 | 274 | ||
271 | source "fs/Kconfig" | 275 | source "fs/Kconfig" |
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c index 45ad1026dde7..c6a14a87c59b 100644 --- a/arch/sh64/kernel/signal.c +++ b/arch/sh64/kernel/signal.c | |||
@@ -697,7 +697,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
697 | if (!user_mode(regs)) | 697 | if (!user_mode(regs)) |
698 | return 1; | 698 | return 1; |
699 | 699 | ||
700 | if (try_to_freeze(0)) | 700 | if (try_to_freeze()) |
701 | goto no_signal; | 701 | goto no_signal; |
702 | 702 | ||
703 | if (!oldset) | 703 | if (!oldset) |
diff --git a/arch/sh64/mm/fault.c b/arch/sh64/mm/fault.c index a24932881dbb..f08d0eaf6497 100644 --- a/arch/sh64/mm/fault.c +++ b/arch/sh64/mm/fault.c | |||
@@ -223,13 +223,13 @@ good_area: | |||
223 | */ | 223 | */ |
224 | survive: | 224 | survive: |
225 | switch (handle_mm_fault(mm, vma, address, writeaccess)) { | 225 | switch (handle_mm_fault(mm, vma, address, writeaccess)) { |
226 | case 1: | 226 | case VM_FAULT_MINOR: |
227 | tsk->min_flt++; | 227 | tsk->min_flt++; |
228 | break; | 228 | break; |
229 | case 2: | 229 | case VM_FAULT_MAJOR: |
230 | tsk->maj_flt++; | 230 | tsk->maj_flt++; |
231 | break; | 231 | break; |
232 | case 0: | 232 | case VM_FAULT_SIGBUS: |
233 | goto do_sigbus; | 233 | goto do_sigbus; |
234 | default: | 234 | default: |
235 | goto out_of_memory; | 235 | goto out_of_memory; |