]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86_64: Rename CF Makefile variable in vdso
authorAndi Kleen <ak@suse.de>
Sun, 22 Jul 2007 19:13:11 +0000 (21:13 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 19:43:28 +0000 (12:43 -0700)
This avoids a conflict with sparse builds.

Reported by Alexey Dobriyan, fix suggested by Al Viro

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86_64/vdso/Makefile

index faaa72fb250c77a64b38a853ec2bd454f3c6166f..8d03de029d9b38d321428bea5e127eae6b274287 100644 (file)
@@ -32,10 +32,10 @@ $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
 $(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE
        $(call if_changed,syscall)
 
-CF := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
+CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
 
-$(obj)/vclock_gettime.o: CFLAGS = $(CF)
-$(obj)/vgetcpu.o: CFLAGS = $(CF)
+$(obj)/vclock_gettime.o: CFLAGS = $(CFL)
+$(obj)/vgetcpu.o: CFLAGS = $(CFL)
 
 # We also create a special relocatable object that should mirror the symbol
 # table and layout of the linked DSO.  With ld -R we can then refer to