updated on Thu Jan 19 20:01:47 UTC 2012
[aur-mirror.git] / rtai-kernel / fix-gcc-4.6-errors.patch
blobc6c4dc075868b3b263d94524061831d6f4a220a8
1 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
2 index 6b4ffed..dd78ef6 100644
3 --- a/arch/x86/vdso/Makefile
4 +++ b/arch/x86/vdso/Makefile
5 @@ -25,7 +25,7 @@ targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
7 export CPPFLAGS_vdso.lds += -P -C
9 -VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -Wl,-soname=linux-vdso.so.1 \
10 +VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
11 -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
13 $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
14 @@ -69,7 +69,7 @@ vdso32.so-$(VDSO32-y) += sysenter
15 vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
17 CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
18 -VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1
19 +VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-soname=linux-gate.so.1
21 # This makes sure the $(obj) subdirectory exists even though vdso32/
22 # is not a kbuild sub-make subdirectory.
24 diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
25 index 8e9b67e..6012410 100644
26 --- a/drivers/net/igbvf/igbvf.h
27 +++ b/drivers/net/igbvf/igbvf.h
28 @@ -125,7 +125,6 @@ struct igbvf_buffer {
29 unsigned int page_offset;
32 - struct page *page;
35 union igbvf_desc {