diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-07-25 13:59:46 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-25 14:53:52 -0400 |
| commit | 5f00bcb38ef9a980a33c6dbdc0044964b05f22dd (patch) | |
| tree | 3175fb9375aecb50bde1be0bf4fa8aa8155131d6 /net/rds/tcp_stats.c | |
| parent | 34006cee28f7344f9557a4be3816c7891b1bbab1 (diff) | |
| parent | b6844e8f64920cdee620157252169ba63afb0c89 (diff) | |
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/rds/tcp_stats.c')
| -rw-r--r-- | net/rds/tcp_stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/tcp_stats.c b/net/rds/tcp_stats.c index d5898d03cd68..f8a7954f1f59 100644 --- a/net/rds/tcp_stats.c +++ b/net/rds/tcp_stats.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | DEFINE_PER_CPU(struct rds_tcp_statistics, rds_tcp_stats) | 40 | DEFINE_PER_CPU(struct rds_tcp_statistics, rds_tcp_stats) |
| 41 | ____cacheline_aligned; | 41 | ____cacheline_aligned; |
| 42 | 42 | ||
| 43 | static const char const *rds_tcp_stat_names[] = { | 43 | static const char * const rds_tcp_stat_names[] = { |
| 44 | "tcp_data_ready_calls", | 44 | "tcp_data_ready_calls", |
| 45 | "tcp_write_space_calls", | 45 | "tcp_write_space_calls", |
| 46 | "tcp_sndbuf_full", | 46 | "tcp_sndbuf_full", |