Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f35bf92 authored Jun 27, 2006 by Andreas Mohr Committed by Linus Torvalds Jun 27, 2006

[PATCH] x86: constify some parts of arch/i386/kernel/cpu/



Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 19eadf98

arch/i386/kernel/cpu/intel_cacheinfo.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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,

arch/i386/kernel/cpu/proc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file m, void v)
		* 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 m, void v)
		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 */