diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 06:54:14 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 06:54:14 +0200 |
commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /arch/sh/include/asm/unistd_64.h | |
parent | sh: Fix up sh4_flush_dcache_page() build on UP. (diff) | |
parent | sh: Fix dcache flushing for N-way write-through caches. (diff) | |
download | linux-ac6a0cf6716bb46813d0161024c66c2af66e53d1.tar.xz linux-ac6a0cf6716bb46813d0161024c66c2af66e53d1.zip |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'arch/sh/include/asm/unistd_64.h')
-rw-r--r-- | arch/sh/include/asm/unistd_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h index a751699afda3..2b84bc916bc5 100644 --- a/arch/sh/include/asm/unistd_64.h +++ b/arch/sh/include/asm/unistd_64.h @@ -137,7 +137,7 @@ #define __NR_clone 120 #define __NR_setdomainname 121 #define __NR_uname 122 -#define __NR_modify_ldt 123 +#define __NR_cacheflush 123 #define __NR_adjtimex 124 #define __NR_mprotect 125 #define __NR_sigprocmask 126 |