Commit 292c669c authored by Markus Metzger's avatar Markus Metzger Committed by Ingo Molnar

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

Impact: cleanup

Move the CONFIG guard from the .c file into the makefile.
Reported-by: default avatarAndi Kleen <andi-suse@firstfloor.org>
Signed-off-by: default avatarMarkus Metzger <markus.t.metzger@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent eff79aee
...@@ -41,7 +41,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o ...@@ -41,7 +41,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
obj-y += process.o obj-y += process.o
obj-y += i387.o xsave.o obj-y += i387.o xsave.o
obj-y += ptrace.o obj-y += ptrace.o
obj-y += ds.o obj-$(CONFIG_X86_DS) += ds.o
obj-$(CONFIG_X86_32) += tls.o obj-$(CONFIG_X86_32) += tls.o
obj-$(CONFIG_IA32_EMULATION) += tls.o obj-$(CONFIG_IA32_EMULATION) += tls.o
obj-y += step.o obj-y += step.o
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
*/ */
#ifdef CONFIG_X86_DS
#include <asm/ds.h> #include <asm/ds.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -878,4 +876,3 @@ void ds_free(struct ds_context *context) ...@@ -878,4 +876,3 @@ void ds_free(struct ds_context *context)
while (leftovers--) while (leftovers--)
ds_put_context(context); ds_put_context(context);
} }
#endif /* CONFIG_X86_DS */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment