aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/kernel-parameters.txt2
-rw-r--r--arch/powerpc/kernel/setup_32.c12
2 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 508e2a2c9864..a1ff28e0872b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -931,6 +931,8 @@ and is between 256 and 4096 characters. It is defined in the file
931 931
932 l2cr= [PPC] 932 l2cr= [PPC]
933 933
934 l3cr= [PPC]
935
934 lapic [X86-32,APIC] Enable the local APIC even if BIOS 936 lapic [X86-32,APIC] Enable the local APIC even if BIOS
935 disabled it. 937 disabled it.
936 938
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index cd870a823d18..eac936eb3190 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)
172} 172}
173__setup("l2cr=", ppc_setup_l2cr); 173__setup("l2cr=", ppc_setup_l2cr);
174 174
175/* Checks "l3cr=xxxx" command-line option */
176int __init ppc_setup_l3cr(char *str)
177{
178 if (cpu_has_feature(CPU_FTR_L3CR)) {
179 unsigned long val = simple_strtoul(str, NULL, 0);
180 printk(KERN_INFO "l3cr set to %lx\n", val);
181 _set_L3CR(val); /* and enable it */
182 }
183 return 1;
184}
185__setup("l3cr=", ppc_setup_l3cr);
186
175#ifdef CONFIG_GENERIC_NVRAM 187#ifdef CONFIG_GENERIC_NVRAM
176 188
177/* Generic nvram hooks used by drivers/char/gen_nvram.c */ 189/* Generic nvram hooks used by drivers/char/gen_nvram.c */