diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-02-20 14:52:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-02-20 14:52:52 +0100 |
| commit | 641e71aefd05caae67766c5b1f5f250a220321aa (patch) | |
| tree | ef821bed9fc4ee2c6e1b4eec4ad4872c49694f33 | |
| parent | f65332f26675a7cbb20ab3d01da47122d4d290f7 (diff) | |
| parent | 27cf929845b10043f2257693c7d179a9e0b1980e (diff) | |
Merge branch 'x86/urgent'
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index a5b4dce1b7ac..904611bf0e5a 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -131,7 +131,7 @@ static int __init parse_lapic(char *arg) { if (config_enabled(CONFIG_X86_32) && !arg) force_enable_local_apic = 1; - else if (!strncmp(arg, "notscdeadline", 13)) + else if (arg && !strncmp(arg, "notscdeadline", 13)) setup_clear_cpu_cap(X86_FEATURE_TSC_DEADLINE_TIMER); return 0; } |