linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / frv / kernel / entry.S

diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 940ac30..1d21c8d 100644 (file)
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -27,6 +27,8 @@
  *
  */
 
+#include <linux/sys.h>
+#include <linux/config.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/setup.h>
@@ -1168,6 +1170,12 @@ __syscall_badsys:
 # syscall vector table
 #
 ###############################################################################
+#ifdef CONFIG_MMU
+#define __MMU(X) X
+#else
+#define __MMU(X) sys_ni_syscall
+#endif
+
        .section .rodata
 ALIGN
        .globl          sys_call_table
@@ -1297,7 +1305,7 @@ sys_call_table:
        .long sys_newuname
        .long sys_ni_syscall    /* old "cacheflush" */
        .long sys_adjtimex
-       .long sys_mprotect      /* 125 */
+       .long __MMU(sys_mprotect) /* 125 */
        .long sys_sigprocmask
        .long sys_ni_syscall    /* old "create_module" */
        .long sys_init_module
@@ -1316,16 +1324,16 @@ sys_call_table:
        .long sys_getdents
        .long sys_select
        .long sys_flock
-       .long sys_msync
+       .long __MMU(sys_msync)
        .long sys_readv         /* 145 */
        .long sys_writev
        .long sys_getsid
        .long sys_fdatasync
        .long sys_sysctl
-       .long sys_mlock         /* 150 */
-       .long sys_munlock
-       .long sys_mlockall
-       .long sys_munlockall
+       .long __MMU(sys_mlock)          /* 150 */
+       .long __MMU(sys_munlock)
+       .long __MMU(sys_mlockall)
+       .long __MMU(sys_munlockall)
        .long sys_sched_setparam
        .long sys_sched_getparam   /* 155 */
        .long sys_sched_setscheduler
@@ -1335,7 +1343,7 @@ sys_call_table:
        .long sys_sched_get_priority_min  /* 160 */
        .long sys_sched_rr_get_interval
        .long sys_nanosleep
-       .long sys_mremap
+       .long __MMU(sys_mremap)
        .long sys_setresuid16
        .long sys_getresuid16   /* 165 */
        .long sys_ni_syscall    /* for vm86 */
@@ -1390,8 +1398,8 @@ sys_call_table:
        .long sys_setfsuid              /* 215 */
        .long sys_setfsgid
        .long sys_pivot_root
-       .long sys_mincore
-       .long sys_madvise
+       .long __MMU(sys_mincore)
+       .long __MMU(sys_madvise)
        .long sys_getdents64    /* 220 */
        .long sys_fcntl64
        .long sys_ni_syscall    /* reserved for TUX */
@@ -1429,7 +1437,7 @@ sys_call_table:
        .long sys_epoll_create
        .long sys_epoll_ctl     /* 255 */
        .long sys_epoll_wait
-       .long sys_remap_file_pages
+       .long __MMU(sys_remap_file_pages)
        .long sys_set_tid_address
        .long sys_timer_create
        .long sys_timer_settime         /* 260 */
@@ -1472,7 +1480,7 @@ sys_call_table:
        .long sys_mknodat
        .long sys_fchownat
        .long sys_futimesat
-       .long sys_fstatat64             /* 300 */
+       .long sys_newfstatat            /* 300 */
        .long sys_unlinkat
        .long sys_renameat
        .long sys_linkat