diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/core/flow.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 59d058a3b504..e660cb57e42a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3340,7 +3340,6 @@ void unregister_netdev(struct net_device *dev) | |||
3340 | 3340 | ||
3341 | EXPORT_SYMBOL(unregister_netdev); | 3341 | EXPORT_SYMBOL(unregister_netdev); |
3342 | 3342 | ||
3343 | #ifdef CONFIG_HOTPLUG_CPU | ||
3344 | static int dev_cpu_callback(struct notifier_block *nfb, | 3343 | static int dev_cpu_callback(struct notifier_block *nfb, |
3345 | unsigned long action, | 3344 | unsigned long action, |
3346 | void *ocpu) | 3345 | void *ocpu) |
@@ -3384,7 +3383,6 @@ static int dev_cpu_callback(struct notifier_block *nfb, | |||
3384 | 3383 | ||
3385 | return NOTIFY_OK; | 3384 | return NOTIFY_OK; |
3386 | } | 3385 | } |
3387 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
3388 | 3386 | ||
3389 | #ifdef CONFIG_NET_DMA | 3387 | #ifdef CONFIG_NET_DMA |
3390 | /** | 3388 | /** |
diff --git a/net/core/flow.c b/net/core/flow.c index 104c25d00a1d..d137f971f97d 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -340,7 +340,6 @@ static void __devinit flow_cache_cpu_prepare(int cpu) | |||
340 | tasklet_init(tasklet, flow_cache_flush_tasklet, 0); | 340 | tasklet_init(tasklet, flow_cache_flush_tasklet, 0); |
341 | } | 341 | } |
342 | 342 | ||
343 | #ifdef CONFIG_HOTPLUG_CPU | ||
344 | static int flow_cache_cpu(struct notifier_block *nfb, | 343 | static int flow_cache_cpu(struct notifier_block *nfb, |
345 | unsigned long action, | 344 | unsigned long action, |
346 | void *hcpu) | 345 | void *hcpu) |
@@ -349,7 +348,6 @@ static int flow_cache_cpu(struct notifier_block *nfb, | |||
349 | __flow_cache_shrink((unsigned long)hcpu, 0); | 348 | __flow_cache_shrink((unsigned long)hcpu, 0); |
350 | return NOTIFY_OK; | 349 | return NOTIFY_OK; |
351 | } | 350 | } |
352 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
353 | 351 | ||
354 | static int __init flow_cache_init(void) | 352 | static int __init flow_cache_init(void) |
355 | { | 353 | { |