Skip to content

Commit

Permalink
x86, bts: exclude ds.c from build when disabled
Browse files Browse the repository at this point in the history
Impact: cleanup

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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Markus Metzger authored and Ingo Molnar committed Nov 25, 2008
1 parent eff79ae commit 292c669
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion arch/x86/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
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
Expand Down
3 changes: 0 additions & 3 deletions arch/x86/kernel/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
*/


#ifdef CONFIG_X86_DS

#include <asm/ds.h>

#include <linux/errno.h>
Expand Down Expand Up @@ -878,4 +876,3 @@ void ds_free(struct ds_context *context)
while (leftovers--)
ds_put_context(context);
}
#endif /* CONFIG_X86_DS */

0 comments on commit 292c669

Please sign in to comment.