From: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
To: mingo@elte.hu, tglx@linutronix.de, hpa@zytor.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] x86: conditionally compile sysfs stuff in intel_cacheinfo.c
Date: Sun, 20 Apr 2008 06:54:34 +0400 [thread overview]
Message-ID: <1208660074-7324-5-git-send-email-dmitri.vorobiev@gmail.com> (raw)
In-Reply-To: <1208660074-7324-1-git-send-email-dmitri.vorobiev@gmail.com>
Four functions defined in arch/x86/kernel/cpu/intel_cacheinfo.c:
cache_shared_cpu_map_setup()
cache_remove_shared_cpu_map()
free_cache_attributes()
detect_cache_attributes()
are needed only in the code that is conditionally compiled when
CONFIG_SYSFS is defined. The same is true about the cpuid4_info[]
array. This patch places the definitions of these functions and
the array inside the corresponding ifdef.
This patch was build-tested both with sysfs turned off and on.
The kernel was built successfully in both cases. Runtime tests
were performed using x86 and x86_64 machines, which booted to
the shell prompt successfully.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
---
arch/x86/kernel/cpu/intel_cacheinfo.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 1b88986..d743dfe 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -450,6 +450,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
return l2;
}
+#ifdef CONFIG_SYSFS
+
/* pointer to _cpuid4_info array (for each cache leaf) */
static struct _cpuid4_info *cpuid4_info[NR_CPUS];
#define CPUID4_INFO_IDX(x,y) (&((cpuid4_info[x])[y]))
@@ -553,8 +555,6 @@ out:
return retval;
}
-#ifdef CONFIG_SYSFS
-
#include <linux/kobject.h>
#include <linux/sysfs.h>
--
1.5.3
next prev parent reply other threads:[~2008-04-20 2:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-20 2:54 [PATCH 0/4] x86: random clean-ups Dmitri Vorobiev
2008-04-20 2:54 ` [PATCH 1/4] x86: remove unused function amd_init_cpu() Dmitri Vorobiev
2008-04-20 2:54 ` [PATCH 2/4] x86: remove unused code and data in nexgen.c Dmitri Vorobiev
2008-04-20 4:22 ` H. Peter Anvin
2008-04-20 10:33 ` [PATCH 2/2 v2] x86: remove unused function, register the cpu vendor " Dmitri Vorobiev
2008-04-20 18:51 ` [PATCH 2/4] x86: remove unused code and data " Andi Kleen
2008-04-20 19:24 ` Dmitri Vorobiev
2008-04-20 19:34 ` H. Peter Anvin
2008-04-20 19:45 ` Dmitri Vorobiev
2008-04-20 19:47 ` H. Peter Anvin
2008-04-20 20:03 ` Andi Kleen
2008-04-20 20:26 ` H. Peter Anvin
2008-04-23 18:19 ` Alan Cox
2008-04-23 19:02 ` Dmitri Vorobiev
2008-04-20 2:54 ` [PATCH 3/4] x86_64: the standard_io_resources[] array can become static Dmitri Vorobiev
2008-04-20 2:54 ` Dmitri Vorobiev [this message]
2008-04-21 12:25 ` [PATCH 0/4] x86: random clean-ups Ingo Molnar
[not found] ` <90edad820804210541h26c8e66dh70895f32e4b4038d@mail.gmail.com>
2008-04-22 14:02 ` Ingo Molnar
2008-04-22 19:18 ` Dmitri Vorobiev
2008-04-22 19:22 ` Ingo Molnar
2008-04-22 19:37 ` Dmitri Vorobiev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1208660074-7324-5-git-send-email-dmitri.vorobiev@gmail.com \
--to=dmitri.vorobiev@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®