Skip to contentSkip to conversation

x86, bts: exclude ds.c from build when disabled

PATCH In review Markus Metzger 1 participant 1 message Nov 25, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/9 x86, bts: exclude ds.c from build when disabled

Move the CONFIG guard from the .c file into the makefile.

---

arch/x86/kernel/Makefile +1 -1
Index: ftrace/arch/x86/kernel/Makefile
===================================================================
@@ -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
arch/x86/kernel/ds.c +0 -3
Index: ftrace/arch/x86/kernel/ds.c
===================================================================
@@ -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.