From 8fbbd06f79d5c36e040e3783d519a60787eaa91f Mon Sep 17 00:00:00 2001 From: Robert Brose Date: Sat, 29 Mar 2008 07:20:23 +1100 Subject: [PATCH] --- yaml --- r: 91491 b: refs/heads/master c: a78bfbfcfaca64e6198f164c43a60afc8a50e2c6 h: refs/heads/master i: 91489: a394b3d4e74f38adaa7815c8492202c81b8c15e0 91487: 1065a9fb858de8349099c46b9d9d6da799b1e606 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 2 ++ trunk/arch/powerpc/kernel/setup_32.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b7c90f7801c5..d768db592c13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b163a256dac8ceb01d40bebe25c315768cf1877b +refs/heads/master: a78bfbfcfaca64e6198f164c43a60afc8a50e2c6 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 508e2a2c9864..a1ff28e0872b 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -931,6 +931,8 @@ and is between 256 and 4096 characters. It is defined in the file l2cr= [PPC] + l3cr= [PPC] + lapic [X86-32,APIC] Enable the local APIC even if BIOS disabled it. diff --git a/trunk/arch/powerpc/kernel/setup_32.c b/trunk/arch/powerpc/kernel/setup_32.c index cd870a823d18..eac936eb3190 100644 --- a/trunk/arch/powerpc/kernel/setup_32.c +++ b/trunk/arch/powerpc/kernel/setup_32.c @@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str) } __setup("l2cr=", ppc_setup_l2cr); +/* Checks "l3cr=xxxx" command-line option */ +int __init ppc_setup_l3cr(char *str) +{ + if (cpu_has_feature(CPU_FTR_L3CR)) { + unsigned long val = simple_strtoul(str, NULL, 0); + printk(KERN_INFO "l3cr set to %lx\n", val); + _set_L3CR(val); /* and enable it */ + } + return 1; +} +__setup("l3cr=", ppc_setup_l3cr); + #ifdef CONFIG_GENERIC_NVRAM /* Generic nvram hooks used by drivers/char/gen_nvram.c */