diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/appldata/appldata_net_sum.c | 4 | ||||
-rw-r--r-- | arch/s390/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/s390/lib/div64.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index f64b8c867ae2..516b3ac9a9b5 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c | |||
@@ -108,10 +108,10 @@ static void appldata_get_net_sum_data(void *data) | |||
108 | collisions = 0; | 108 | collisions = 0; |
109 | read_lock(&dev_base_lock); | 109 | read_lock(&dev_base_lock); |
110 | for (dev = dev_base; dev != NULL; dev = dev->next) { | 110 | for (dev = dev_base; dev != NULL; dev = dev->next) { |
111 | if (dev->get_stats == NULL) { | 111 | stats = dev->get_stats(dev); |
112 | if (stats == NULL) { | ||
112 | continue; | 113 | continue; |
113 | } | 114 | } |
114 | stats = dev->get_stats(dev); | ||
115 | rx_packets += stats->rx_packets; | 115 | rx_packets += stats->rx_packets; |
116 | tx_packets += stats->tx_packets; | 116 | tx_packets += stats->tx_packets; |
117 | rx_bytes += stats->rx_bytes; | 117 | rx_bytes += stats->rx_bytes; |
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile index 7a44fed21b35..59aea65ce99f 100644 --- a/arch/s390/lib/Makefile +++ b/arch/s390/lib/Makefile | |||
@@ -5,6 +5,6 @@ | |||
5 | EXTRA_AFLAGS := -traditional | 5 | EXTRA_AFLAGS := -traditional |
6 | 6 | ||
7 | lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o | 7 | lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o |
8 | lib-$(CONFIG_32BIT) += div64.o | 8 | obj-$(CONFIG_32BIT) += div64.o |
9 | lib-$(CONFIG_64BIT) += uaccess_mvcos.o | 9 | lib-$(CONFIG_64BIT) += uaccess_mvcos.o |
10 | lib-$(CONFIG_SMP) += spinlock.o | 10 | lib-$(CONFIG_SMP) += spinlock.o |
diff --git a/arch/s390/lib/div64.c b/arch/s390/lib/div64.c index 0481f3424a13..a5f8300bf3ee 100644 --- a/arch/s390/lib/div64.c +++ b/arch/s390/lib/div64.c | |||
@@ -147,5 +147,3 @@ uint32_t __div64_32(uint64_t *n, uint32_t base) | |||
147 | } | 147 | } |
148 | 148 | ||
149 | #endif /* MARCH_G5 */ | 149 | #endif /* MARCH_G5 */ |
150 | |||
151 | EXPORT_SYMBOL(__div64_32); | ||