The patch titled
x86: constify some parts of arch/i386/kernel/cpu/
has been removed from the -mm tree. Its filename is
x86-constify-some-parts-of-arch-i386-kernel-cpu.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86: constify some parts of arch/i386/kernel/cpu/
From: Andreas Mohr <andi@xxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andreas Mohr <andi@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/cpu/intel_cacheinfo.c | 6 +++---
arch/i386/kernel/cpu/proc.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN arch/i386/kernel/cpu/intel_cacheinfo.c~x86-constify-some-parts-of-arch-i386-kernel-cpu arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c~x86-constify-some-parts-of-arch-i386-kernel-cpu
+++ a/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -159,13 +159,13 @@ union l2_cache {
unsigned val;
};
-static unsigned short assocs[] = {
+static const unsigned short assocs[] = {
[1] = 1, [2] = 2, [4] = 4, [6] = 8,
[8] = 16,
[0xf] = 0xffff // ??
};
-static unsigned char levels[] = { 1, 1, 2 };
-static unsigned char types[] = { 1, 2, 3 };
+static const unsigned char levels[] = { 1, 1, 2 };
+static const unsigned char types[] = { 1, 2, 3 };
static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,
union _cpuid4_leaf_ebx *ebx,
diff -puN arch/i386/kernel/cpu/proc.c~x86-constify-some-parts-of-arch-i386-kernel-cpu arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/cpu/proc.c~x86-constify-some-parts-of-arch-i386-kernel-cpu
+++ a/arch/i386/kernel/cpu/proc.c
@@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file
* applications want to get the raw CPUID data, they should access
* /dev/cpu/<cpu_nr>/cpuid instead.
*/
- static char *x86_cap_flags[] = {
+ static const char * const x86_cap_flags[] = {
/* Intel-defined */
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
@@ -62,7 +62,7 @@ static int show_cpuinfo(struct seq_file
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
- static char *x86_power_flags[] = {
+ static const char * const x86_power_flags[] = {
"ts", /* temperature sensor */
"fid", /* frequency id control */
"vid", /* voltage id control */
_
Patches currently in -mm which might be from andi@xxxxxxxxxxxxxxxxxxxxxxx are
origin.patch
cpu_relax-use-in-acpi-lock.patch
ni5010-netcard-cleanup.patch
acx1xx-wireless-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
