lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-05-27 10:58:49 -07:00
parent b14f3bd90d add8a5050a
commit b5c42bc8db
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MAINTAINERS
View File

@@ -1132,17 +1132,17 @@ F: fs/bfs/
F: include/linux/bfs_fs.h F: include/linux/bfs_fs.h
BLACKFIN ARCHITECTURE BLACKFIN ARCHITECTURE
P: Bryan Wu P: Mike Frysinger
M: cooloney@kernel.org M: vapier@gentoo.org
L: uclinux-dist-devel@blackfin.uclinux.org L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org W: http://blackfin.uclinux.org
S: Supported S: Supported
F: arch/blackfin/ F: arch/blackfin/
BLACKFIN EMAC DRIVER BLACKFIN EMAC DRIVER
P: Bryan Wu P: Michael Hennerich
M: cooloney@kernel.org M: michael.hennerich@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org W: http://blackfin.uclinux.org
S: Supported S: Supported
F: drivers/net/bfin_mac.* F: drivers/net/bfin_mac.*
@@ -1150,7 +1150,7 @@ F: drivers/net/bfin_mac.*
BLACKFIN RTC DRIVER BLACKFIN RTC DRIVER
P: Mike Frysinger P: Mike Frysinger
M: vapier.adi@gmail.com M: vapier.adi@gmail.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org W: http://blackfin.uclinux.org
S: Supported S: Supported
F: drivers/rtc/rtc-bfin.c F: drivers/rtc/rtc-bfin.c
@@ -1158,7 +1158,7 @@ F: drivers/rtc/rtc-bfin.c
BLACKFIN SERIAL DRIVER BLACKFIN SERIAL DRIVER
P: Sonic Zhang P: Sonic Zhang
M: sonic.zhang@analog.com M: sonic.zhang@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org W: http://blackfin.uclinux.org
S: Supported S: Supported
F: drivers/serial/bfin_5xx.c F: drivers/serial/bfin_5xx.c
@@ -1166,7 +1166,7 @@ F: drivers/serial/bfin_5xx.c
BLACKFIN WATCHDOG DRIVER BLACKFIN WATCHDOG DRIVER
P: Mike Frysinger P: Mike Frysinger
M: vapier.adi@gmail.com M: vapier.adi@gmail.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org W: http://blackfin.uclinux.org
S: Supported S: Supported
F: drivers/watchdog/bfin_wdt.c F: drivers/watchdog/bfin_wdt.c
@@ -1174,7 +1174,7 @@ F: drivers/watchdog/bfin_wdt.c
BLACKFIN I2C TWI DRIVER BLACKFIN I2C TWI DRIVER
P: Sonic Zhang P: Sonic Zhang
M: sonic.zhang@analog.com M: sonic.zhang@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org/ W: http://blackfin.uclinux.org/
S: Supported S: Supported
F: drivers/i2c/busses/i2c-bfin-twi.c F: drivers/i2c/busses/i2c-bfin-twi.c

1
arch/blackfin/include/asm/.gitignore vendored
View File

@@ -1 +0,0 @@
+mach

4
arch/blackfin/include/asm/unistd.h
View File

@@ -378,8 +378,10 @@
#define __NR_dup3 363 #define __NR_dup3 363
#define __NR_pipe2 364 #define __NR_pipe2 364
#define __NR_inotify_init1 365 #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 #define NR_syscalls __NR_syscall
/* Old optional stuff no one actually uses */ /* Old optional stuff no one actually uses */

1
arch/blackfin/kernel/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
vmlinux.lds

3
arch/blackfin/lib/strncmp.c
View File

@@ -8,9 +8,8 @@
#define strncmp __inline_strncmp #define strncmp __inline_strncmp
#include <asm/string.h> #include <asm/string.h>
#undef strncmp
#include <linux/module.h> #include <linux/module.h>
#undef strncmp
int strncmp(const char *cs, const char *ct, size_t count) int strncmp(const char *cs, const char *ct, size_t count)
{ {

2
arch/blackfin/mach-common/entry.S
View File

@@ -1581,6 +1581,8 @@ ENTRY(_sys_call_table)
.long _sys_dup3 .long _sys_dup3
.long _sys_pipe2 .long _sys_pipe2
.long _sys_inotify_init1 /* 365 */ .long _sys_inotify_init1 /* 365 */
.long _sys_preadv
.long _sys_pwritev
.rept NR_syscalls-(.-_sys_call_table)/4 .rept NR_syscalls-(.-_sys_call_table)/4
.long _sys_ni_syscall .long _sys_ni_syscall