From ec55759462c4844b344b2fe6b4035d6cd438867b Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Tue, 25 Nov 2008 08:45:13 +0100 Subject: [PATCH] --- yaml --- r: 119407 b: refs/heads/master c: 292c669cd7087a090d6420e223eb1072f3e3c50b h: refs/heads/master i: 119405: 97f7f4dffad991fb0cf0b79c9f3f69568138744f 119403: e49800ef8caebc4055caa8dc3f7c7d503bc5beae 119399: 0457631c6f074ca9d657dda8b910dddd8ee84c55 119391: f9a319e2e0c4e0637677f41896a9afc5e223d4a0 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 2 +- trunk/arch/x86/kernel/ds.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3f7ca96f383c..f5c57e5d68d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eff79aee91dd07e944df65fa448c8baeee7709d8 +refs/heads/master: 292c669cd7087a090d6420e223eb1072f3e3c50b diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index e489ff9cb3e2..b62a7667828e 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -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 diff --git a/trunk/arch/x86/kernel/ds.c b/trunk/arch/x86/kernel/ds.c index d1a121443bde..4c8d57ec9663 100644 --- a/trunk/arch/x86/kernel/ds.c +++ b/trunk/arch/x86/kernel/ds.c @@ -21,8 +21,6 @@ */ -#ifdef CONFIG_X86_DS - #include #include @@ -878,4 +876,3 @@ void ds_free(struct ds_context *context) while (leftovers--) ds_put_context(context); } -#endif /* CONFIG_X86_DS */