diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-27 10:58:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-27 10:58:49 -0700 |
| commit | b5c42bc8db17db80917f99205a03c51f17354495 (patch) | |
| tree | 74eb53f5199881fcd6e4907693cf21e37b2cd17e /arch | |
| parent | b14f3bd90d2202a83f36eac85bcb3db0fba7d6a6 (diff) | |
| parent | add8a5050a52f1bd1be6b97be86fdd1cfbea2d1d (diff) | |
| download | linux-3.10-b5c42bc8db17db80917f99205a03c51f17354495.tar.gz linux-3.10-b5c42bc8db17db80917f99205a03c51f17354495.tar.bz2 linux-3.10-b5c42bc8db17db80917f99205a03c51f17354495.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix strncmp.o build error
Blackfin: drop unneeded asm/.gitignore
Blackfin: ignore generated vmlinux.lds
MAINTAINERS: drop (subscribers-only) markings on Blackfin lists
MAINTAINERS: update Blackfin items
Blackfin: hook up preadv/pwritev syscalls
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/include/asm/.gitignore | 1 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/unistd.h | 4 | ||||
| -rw-r--r-- | arch/blackfin/kernel/.gitignore | 1 | ||||
| -rw-r--r-- | arch/blackfin/lib/strncmp.c | 3 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/entry.S | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/arch/blackfin/include/asm/.gitignore b/arch/blackfin/include/asm/.gitignore deleted file mode 100644 index 7858564a446..00000000000 --- a/arch/blackfin/include/asm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -+mach diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h index 1e57b636e0b..cf5066d3efd 100644 --- a/arch/blackfin/include/asm/unistd.h +++ b/arch/blackfin/include/asm/unistd.h @@ -378,8 +378,10 @@ #define __NR_dup3 363 #define __NR_pipe2 364 #define __NR_inotify_init1 365 +#define __NR_preadv 366 +#define __NR_pwritev 367 -#define __NR_syscall 366 +#define __NR_syscall 368 #define NR_syscalls __NR_syscall /* Old optional stuff no one actually uses */ diff --git a/arch/blackfin/kernel/.gitignore b/arch/blackfin/kernel/.gitignore new file mode 100644 index 00000000000..c5f676c3c22 --- /dev/null +++ b/arch/blackfin/kernel/.gitignore @@ -0,0 +1 @@ +vmlinux.lds diff --git a/arch/blackfin/lib/strncmp.c b/arch/blackfin/lib/strncmp.c index 2aaae78a68e..46518b1d298 100644 --- a/arch/blackfin/lib/strncmp.c +++ b/arch/blackfin/lib/strncmp.c @@ -8,9 +8,8 @@ #define strncmp __inline_strncmp #include <asm/string.h> -#undef strncmp - #include <linux/module.h> +#undef strncmp int strncmp(const char *cs, const char *ct, size_t count) { diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 21e65a339a2..a063a434f7e 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S @@ -1581,6 +1581,8 @@ ENTRY(_sys_call_table) .long _sys_dup3 .long _sys_pipe2 .long _sys_inotify_init1 /* 365 */ + .long _sys_preadv + .long _sys_pwritev .rept NR_syscalls-(.-_sys_call_table)/4 .long _sys_ni_syscall |