Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fd7481047882eaa0a692a545d5f8419612ece1b0

Authored by Paolo 'Blaisorblade' Giarrusso
Committed by Linus Torvalds
1 parent 8e5cb35a60
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] uml: Fix conflict between libc and ipv6 

gcc is now complaining during link on some hosts - fix it as for other things.
Reported by Antoine Martin <antoine@nagafix.co.uk>.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 5 additions and 1 deletions Side-by-side Diff

... ... @@ -53,9 +53,13 @@
53 53  
54 54 # -Dvmap=kernel_vmap affects everything, and prevents anything from
55 55 # referencing the libpcap.o symbol so named.
  56 +#
  57 +# Same things for in6addr_loopback - found in libc.
56 58  
57 59 CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
58   - $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap
  60 + $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \
  61 + -Din6addr_loopback=kernel_in6addr_loopback
  62 +
59 63 AFLAGS += $(ARCH_INCLUDE)
60 64  
61 65 USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))