Messages in this thread Patch in this message | | | Date | Tue, 25 Nov 2008 08:45:13 +0100 | From | Markus Metzger <> | Subject | [patch 1/9] x86, bts: exclude ds.c from build when disabled |
| |
Move the CONFIG guard from the .c file into the makefile.
Reported-by: Andi Kleen <andi-suse@firstfloor.org> Signed-off-by: Markus Metzger <markus.t.metzger@intel.com> ---
Index: ftrace/arch/x86/kernel/Makefile =================================================================== --- ftrace.orig/arch/x86/kernel/Makefile 2008-11-24 12:57:07.000000000 +0100 +++ ftrace/arch/x86/kernel/Makefile 2008-11-24 12:58:31.000000000 +0100 @@ -48,7 +48,7 @@ obj-y += process.o obj-y += i387.o xsave.o obj-y += ptrace.o -obj-y += ds.o +obj-$(CONFIG_X86_DS) += ds.o obj-$(CONFIG_X86_32) += tls.o obj-$(CONFIG_IA32_EMULATION) += tls.o obj-y += step.o Index: ftrace/arch/x86/kernel/ds.c =================================================================== --- ftrace.orig/arch/x86/kernel/ds.c 2008-11-24 12:57:08.000000000 +0100 +++ ftrace/arch/x86/kernel/ds.c 2008-11-24 12:58:31.000000000 +0100 @@ -21,8 +21,6 @@ */ -#ifdef CONFIG_X86_DS - #include <asm/ds.h> #include <linux/errno.h> @@ -877,4 +875,3 @@ while (leftovers--) ds_put_context(context); } -#endif /* CONFIG_X86_DS */ --------------------------------------------------------------------- Intel GmbH Dornacher Strasse 1 85622 Feldkirchen/Muenchen Germany Sitz der Gesellschaft: Feldkirchen bei Muenchen Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer Registergericht: Muenchen HRB 47456 Ust.-IdNr. VAT Registration No.: DE129385895 Citibank Frankfurt (BLZ 502 109 00) 600119052 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
| |