diff options
| -rw-r--r-- | drivers/net/eexpress.c | 2 | ||||
| -rw-r--r-- | drivers/net/ni5010.c | 2 | ||||
| -rw-r--r-- | kernel/cgroup.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 9c85e50014b4..70509ed6c11d 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
| @@ -651,9 +651,9 @@ static void eexp_timeout(struct net_device *dev) | |||
| 651 | */ | 651 | */ |
| 652 | static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) | 652 | static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) |
| 653 | { | 653 | { |
| 654 | struct net_local *lp = netdev_priv(dev); | ||
| 655 | short length = buf->len; | 654 | short length = buf->len; |
| 656 | #ifdef CONFIG_SMP | 655 | #ifdef CONFIG_SMP |
| 656 | struct net_local *lp = netdev_priv(dev); | ||
| 657 | unsigned long flags; | 657 | unsigned long flags; |
| 658 | #endif | 658 | #endif |
| 659 | 659 | ||
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index 14a768fbce2e..a20005c09e07 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
| @@ -518,7 +518,6 @@ static void dump_packet(void *buf, int len) | |||
| 518 | /* We have a good packet, get it out of the buffer. */ | 518 | /* We have a good packet, get it out of the buffer. */ |
| 519 | static void ni5010_rx(struct net_device *dev) | 519 | static void ni5010_rx(struct net_device *dev) |
| 520 | { | 520 | { |
| 521 | struct ni5010_local *lp = netdev_priv(dev); | ||
| 522 | int ioaddr = dev->base_addr; | 521 | int ioaddr = dev->base_addr; |
| 523 | unsigned char rcv_stat; | 522 | unsigned char rcv_stat; |
| 524 | struct sk_buff *skb; | 523 | struct sk_buff *skb; |
| @@ -577,7 +576,6 @@ static void ni5010_rx(struct net_device *dev) | |||
| 577 | 576 | ||
| 578 | PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n", | 577 | PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n", |
| 579 | dev->name, i_pkt_size)); | 578 | dev->name, i_pkt_size)); |
| 580 | |||
| 581 | } | 579 | } |
| 582 | 580 | ||
| 583 | static int process_xmt_interrupt(struct net_device *dev) | 581 | static int process_xmt_interrupt(struct net_device *dev) |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 5987dccdb2a0..3fe21e19c96e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -2402,7 +2402,6 @@ struct file_operations proc_cgroup_operations = { | |||
| 2402 | static int proc_cgroupstats_show(struct seq_file *m, void *v) | 2402 | static int proc_cgroupstats_show(struct seq_file *m, void *v) |
| 2403 | { | 2403 | { |
| 2404 | int i; | 2404 | int i; |
| 2405 | struct cgroupfs_root *root; | ||
| 2406 | 2405 | ||
| 2407 | seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n"); | 2406 | seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n"); |
| 2408 | mutex_lock(&cgroup_mutex); | 2407 | mutex_lock(&cgroup_mutex); |
