3 files changed, 42 insertions, 1 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index f7b171b92ea2..cf1c446e003a 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -86,6 +86,14 @@ config HIGHPTE
           with a lot of RAM, this can be wasteful of precious low memory.
           Setting this option will put user-space page tables in high memory.
 
+config LARGE_ALLOCS
+        bool "Allow allocating large blocks (> 1MB) of memory"
+        help
+          Allow the slab memory allocator to keep chains for very large memory
+          sizes - up to 32MB. You may need this if your system has a lot of
+          RAM, and you need to able to allocate very large contiguous chunks.
+          If unsure, say N.
+
 source "mm/Kconfig"
 
 choice
diff --git a/arch/frv/kernel/Makefile b/arch/frv/kernel/Makefile
index 32db3499c461..e8f73ed28b52 100644
--- a/arch/frv/kernel/Makefile
+++ b/arch/frv/kernel/Makefile
@@ -8,7 +8,7 @@ heads-$(CONFIG_MMU)		:= head-mmu-fr451.o
 extra-y:= head.o init_task.o vmlinux.lds
 
 obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o kernel_thread.o \
-         process.o traps.o ptrace.o signal.o dma.o \
+         kernel_execve.o process.o traps.o ptrace.o signal.o dma.o \
          sys_frv.o time.o semaphore.o setup.o frv_ksyms.o \
          debug-stub.o irq.o sleep.o uaccess.o
 
diff --git a/arch/frv/kernel/kernel_execve.S b/arch/frv/kernel/kernel_execve.S
new file mode 100644
index 000000000000..9b074a16a052
--- /dev/null
+++ b/arch/frv/kernel/kernel_execve.S
@@ -0,0 +1,33 @@
+/* in-kernel program execution
+ *
+ * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/linkage.h>
+#include <asm/unistd.h>
+
+###############################################################################
+#
+# Do a system call from kernel instead of calling sys_execve so we end up with
+# proper pt_regs.
+#
+# int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+#
+# On entry: GR8/GR9/GR10: arguments to function
+# On return: GR8: syscall return.
+#
+###############################################################################
+        .globl          kernel_execve
+        .type           kernel_execve,@function
+kernel_execve:
+        setlos          __NR_execve,gr7
+        tira            gr0,#0
+        bralr
+
+        .size           kernel_execve,.-kernel_execve