Blackfin fixes for 2.6.30
cover Blackfin fixes for 2.6.30
Sorry for being so late, but our previous Blackfin maintainer has moved on, so we've been working at picking up the slack.
So the stuff here for 2.6.30 is just simple build fixes, gitignore tweaks, MAINTAINER updates, and hooking up the new pread syscalls (which was posted a while ago already).
Mike Frysinger (7):
bfin_mac: fix build error due to net_device_ops convert
Blackfin: hook up preadv/pwritev syscalls
MAINTAINERS: update Blackfin items
MAINTAINERS: drop (subscribers-only) markings on Blackfin lists
Blackfin: ignore generated vmlinux.lds
Blackfin: drop unneeded asm/.gitignore
Blackfin: fix strncmp.o build error
MAINTAINERS | 18 +++++++++--------- arch/blackfin/include/asm/.gitignore | 1 - arch/blackfin/include/asm/unistd.h | 4 +++- arch/blackfin/kernel/.gitignore | 1 + arch/blackfin/lib/strncmp.c | 3 +-- arch/blackfin/mach-common/entry.S | 2 ++ drivers/net/bfin_mac.c | 29 ++++++++++++++--------------- 7 files changed, 30 insertions(+), 28 deletions(-) delete mode 100644 arch/blackfin/include/asm/.gitignore create mode 100644 arch/blackfin/kernel/.gitignore
PATCH 1/7 bfin_mac: fix build error due to net_device_ops convert
The previous commit "convert to net_device_ops" broke the Blackfin MAC driver as it declared the new structure before the function it used:
CC drivers/net/bfin_mac.odrivers/net/bfin_mac.c:984: error: ‘bfin_mac_close’ undeclared here (not in a function) make[1]: *** [drivers/net/bfin_mac.o] Error 1
--- drivers/net/bfin_mac.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)
drivers/net/bfin_mac.c +14 -15
@@ -979,22 +979,7 @@ static int bfin_mac_open(struct net_device *dev)return 0 ; } -static const struct net_device_ops bfin_mac_netdev_ops = { - .ndo_open = bfin_mac_open, - .ndo_stop = bfin_mac_close, - .ndo_start_xmit = bfin_mac_hard_start_xmit, - .ndo_set_mac_address = bfin_mac_set_mac_address, - .ndo_tx_timeout = bfin_mac_timeout, - .ndo_set_multicast_list = bfin_mac_set_multicast_list, - .ndo_validate_addr = eth_validate_addr, - .ndo_change_mtu = eth_change_mtu, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = bfin_mac_poll, -#endif -}; -/* -* * this makes the board clean up everything that it can * and not talk to the outside world. Caused by * an 'ifconfig ethX down'
@@ -1019,6 +1004,20 @@ static int bfin_mac_close(struct net_device *dev)return 0 ; } +static const struct net_device_ops bfin_mac_netdev_ops = { + .ndo_open = bfin_mac_open, + .ndo_stop = bfin_mac_close, + .ndo_start_xmit = bfin_mac_hard_start_xmit, + .ndo_set_mac_address = bfin_mac_set_mac_address, + .ndo_tx_timeout = bfin_mac_timeout, + .ndo_set_multicast_list = bfin_mac_set_multicast_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = bfin_mac_poll, +#endif +}; +static int __devinit bfin_mac_probe (struct platform_device *pdev) {struct net_device *ndev;
Signature · 1 line
1.6.3.1
PATCH 2/7 Blackfin: hook up preadv/pwritev syscalls
In reply to Mike Frysinger--- arch/blackfin/include/asm/unistd.h | 4 +++- arch/blackfin/mach-common/entry.S | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-)
arch/blackfin/include/asm/unistd.h +3 -1
@@ -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 */
arch/blackfin/mach-common/entry.S +2 -0
@@ -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
Signature · 1 line
1.6.3.1
PATCH 3/7 MAINTAINERS: update Blackfin items
In reply to Mike FrysingerWith Bryan Wu having moved on to another job, push the slack onto some other ADI lackeys.
--- MAINTAINERS | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
MAINTAINERS +4 -4
@@ -1132,16 +1132,16 @@ F: fs/bfs/ F: include/linux/bfs_fs.h BLACKFIN ARCHITECTURE -P: Bryan Wu -M: [email protected] +P: Mike Frysinger +M: [email protected] L: [email protected] W: http://blackfin.uclinux.org S: Supported F: arch/blackfin/ BLACKFIN EMAC DRIVER -P: Bryan Wu -M: [email protected] +P: Michael Hennerich +M: [email protected] L: [email protected] (subscribers-only) W: http://blackfin.uclinux.org S: Supported
Signature · 1 line
1.6.3.1
PATCH 4/7 MAINTAINERS: drop (subscribers-only) markings on Blackfin lists
In reply to Mike FrysingerAll of the Blackfin lists are transparently moderated for non-subscribers. i.e. there are no annoying notices and people get whitelisted after first their posting.
--- MAINTAINERS | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
MAINTAINERS +5 -5
@@ -1142,7 +1142,7 @@ F: arch/blackfin/ BLACKFIN EMAC DRIVER P: Michael Hennerich M: [email protected] -L: [email protected] (subscribers-only) +L: [email protected] W: http://blackfin.uclinux.org S: Supported F: drivers/net/bfin_mac.*
@@ -1150,7 +1150,7 @@ F: drivers/net/bfin_mac.* BLACKFIN RTC DRIVER P: Mike Frysinger M: [email protected] -L: [email protected] (subscribers-only) +L: [email protected] W: http://blackfin.uclinux.org S: Supported F: drivers/rtc/rtc-bfin.c
@@ -1158,7 +1158,7 @@ F: drivers/rtc/rtc-bfin.c BLACKFIN SERIAL DRIVER P: Sonic Zhang M: [email protected] -L: [email protected] (subscribers-only) +L: [email protected] W: http://blackfin.uclinux.org S: Supported F: drivers/serial/bfin_5xx.c
@@ -1166,7 +1166,7 @@ F: drivers/serial/bfin_5xx.c BLACKFIN WATCHDOG DRIVER P: Mike Frysinger M: [email protected] -L: [email protected] (subscribers-only) +L: [email protected] W: http://blackfin.uclinux.org S: Supported F: drivers/watchdog/bfin_wdt.c
@@ -1174,7 +1174,7 @@ F: drivers/watchdog/bfin_wdt.c BLACKFIN I2C TWI DRIVER P: Sonic Zhang M: [email protected] -L: [email protected] (subscribers-only) +L: [email protected] W: http://blackfin.uclinux.org/ S: Supported F: drivers/i2c/busses/i2c-bfin-twi.c
Signature · 1 line
1.6.3.1
PATCH 5/7 Blackfin: ignore generated vmlinux.lds
In reply to Mike Frysinger--- arch/blackfin/kernel/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 arch/blackfin/kernel/.gitignore
arch/blackfin/kernel/.gitignore new file +1 -0
@@ -0,0 +1 @@ +vmlinux.lds
Signature · 1 line
1.6.3.1
PATCH 6/7 Blackfin: drop unneeded asm/.gitignore
In reply to Mike FrysingerWe don't create a include/asm/mach/ symlink anymore, so we don't need the .gitignore for it.
--- arch/blackfin/include/asm/.gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 100644 arch/blackfin/include/asm/.gitignore
arch/blackfin/include/asm/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -+mach
Signature · 1 line
1.6.3.1
PATCH 7/7 Blackfin: fix strncmp.o build error
In reply to Mike FrysingerFix some more fallout of the string changes:
CC arch/blackfin/lib/strncmp.o
In file included from include/linux/bitmap.h:9,
from include/linux/nodemask.h:90,
from include/linux/mmzone.h:17,
from include/linux/gfp.h:5,
from include/linux/kmod.h:23,
from include/linux/module.h:14,
from arch/blackfin/lib/strncmp.c:14:include/linux/string.h: In function ‘strstarts’:include/linux/string.h:132: error: implicit declaration of function ‘strncmp’ make[1]: *** [arch/blackfin/lib/strncmp.o] Error 1
--- arch/blackfin/lib/strncmp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
arch/blackfin/lib/strncmp.c +1 -2
@@ -8,9 +8,8 @@#define strncmp __inline_strncmp#include <asm/string.h> -#undef strncmp -#include <linux/module.h> +#undef strncmpint strncmp (const char *cs,const char *ct,size_t count) {
Signature · 1 line
1.6.3.1
David Miller
maintainerFrom: Mike Frysinger <[email protected]>
Date: Tue, 26 May 2009 05:15:49 -0400
Quoted 6 lines
Sorry for being so late, but our previous Blackfin maintainer has moved on, so we've been working at picking up the slack.
So the stuff here for 2.6.30 is just simple build fixes, gitignore tweaks, MAINTAINER updates, and hooking up the new pread syscalls (which was posted a while ago already).
Several problems:
1) 10 patches is way too much this late in the 2.6.30 release process.
Pick 1 or 2 that are the most critical and submit those for 2.6.30, the rest get queued up for 2.6.31
2) Networking patches must have [email protected] at least CC:'d so that your patches get properly traced at:
http://patchwork.ozlabs.org/project/netdev/list/
Thank you.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Tue, 26 May 2009 02:26:59 -0700 (PDT)
Quoted 9 lines
1) 10 patches is way too much this late in the 2.6.30 release process.
Pick 1 or 2 that are the most critical and submit those for 2.6.30, the rest get queued up for 2.6.31
2) Networking patches must have [email protected] at least CC:'d so that your patches get properly traced at:
I take back #1 I see what you're doing.
Please submit the one bfin_mac network driver patch via the proper channels, that would be [email protected] as mentioned, so I can queue it up.
Thanks.
Quoted 3 lines · David Miller
Please submit the one
bfin_macnetwork driver patch via the proper channels, that would be [email protected] as mentioned, so I can queue it up.
resent
-mike