diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:30 +0200 |
| commit | 6ab561c8aab2e4af535f09adbc6253f958536848 (patch) | |
| tree | 37846adb4ea106485720d113e252d71d615c23ed /arch/avr32 | |
| parent | 4f4e8f69895c8696a4bcc751817d4b186023ac44 (diff) | |
| parent | cbaa9f60d5d5c3af10f94e0d49789d5b82341a4a (diff) | |
Merge branch 'topic/isa' into topic/misc
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/Kconfig | 3 | ||||
| -rw-r--r-- | arch/avr32/Makefile | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/local64.h | 1 | ||||
| -rw-r--r-- | arch/avr32/mm/fault.c | 14 |
4 files changed, 6 insertions, 14 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index f2b31933318..f51572772e2 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE config RWSEM_GENERIC_SPINLOCK def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS def_bool y diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile index ead8a75203a..22fb66590dc 100644 --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile @@ -13,7 +13,7 @@ KBUILD_DEFCONFIG := atstk1002_defconfig KBUILD_CFLAGS += -pipe -fno-builtin -mno-pic KBUILD_AFLAGS += -mrelax -mno-pic -CFLAGS_MODULE += -mno-relax +KBUILD_CFLAGS_MODULE += -mno-relax LDFLAGS_vmlinux += --relax cpuflags-$(CONFIG_PLATFORM_AT32AP) += -march=ap diff --git a/arch/avr32/include/asm/local64.h b/arch/avr32/include/asm/local64.h new file mode 100644 index 00000000000..36c93b5cc23 --- /dev/null +++ b/arch/avr32/include/asm/local64.h @@ -0,0 +1 @@ +#include <asm-generic/local64.h> diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index b61d86d3deb..f7040a1e399 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -132,7 +132,6 @@ good_area: * sure we exit gracefully rather than endlessly redo the * fault. */ -survive: fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) @@ -211,15 +210,10 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(current)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } - printk("VM: Killing process %s\n", tsk->comm); - if (user_mode(regs)) - do_group_exit(SIGKILL); - goto no_context; + pagefault_out_of_memory(); + if (!user_mode(regs)) + goto no_context; + return; do_sigbus: up_read(&mm->mmap_sem); |