Commit 32f862c310cbd0b430a14911c8b7e2cd415c56ea
Committed by
Linus Torvalds
Linus Torvalds
1 parent
ee1eca5d24
Exists in
master
and in
7 other branches
uml: fix build for !CONFIG_TCP
Make UML build in the absence of CONFIG_INET by making the inetaddr_notifier registration depend on it. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 12 additions and 2 deletions Side-by-side Diff
arch/um/drivers/net_kern.c
| ... | ... | @@ -753,6 +753,7 @@ |
| 753 | 753 | .remove = net_remove, |
| 754 | 754 | }; |
| 755 | 755 | |
| 756 | +#ifdef CONFIG_INET | |
| 756 | 757 | static int uml_inetaddr_event(struct notifier_block *this, unsigned long event, |
| 757 | 758 | void *ptr) |
| 758 | 759 | { |
| 759 | 760 | |
| ... | ... | @@ -789,14 +790,13 @@ |
| 789 | 790 | .notifier_call = uml_inetaddr_event, |
| 790 | 791 | }; |
| 791 | 792 | |
| 792 | -static int uml_net_init(void) | |
| 793 | +static void inet_register(void) | |
| 793 | 794 | { |
| 794 | 795 | struct list_head *ele; |
| 795 | 796 | struct uml_net_private *lp; |
| 796 | 797 | struct in_device *ip; |
| 797 | 798 | struct in_ifaddr *in; |
| 798 | 799 | |
| 799 | - mconsole_register_dev(&net_mc); | |
| 800 | 800 | register_inetaddr_notifier(¨_inetaddr_notifier); |
| 801 | 801 | |
| 802 | 802 | /* Devices may have been opened already, so the uml_inetaddr_notifier |
| 803 | 803 | |
| ... | ... | @@ -816,7 +816,17 @@ |
| 816 | 816 | } |
| 817 | 817 | } |
| 818 | 818 | spin_unlock(&opened_lock); |
| 819 | +} | |
| 820 | +#else | |
| 821 | +static inline void inet_register(void) | |
| 822 | +{ | |
| 823 | +} | |
| 824 | +#endif | |
| 819 | 825 | |
| 826 | +static int uml_net_init(void) | |
| 827 | +{ | |
| 828 | + mconsole_register_dev(&net_mc); | |
| 829 | + inet_register(); | |
| 820 | 830 | return 0; |
| 821 | 831 | } |
| 822 | 832 |