Skip to content

Commit

Permalink
x86: Allow multiple values to be specified with "hpet="
Browse files Browse the repository at this point in the history
This is particularly to be able to specify "hpet=force,verbose",
as "force" ought to be a primary candidate for also wanting to
use "verbose".

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4F79D120020000780007C031@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Jan Beulich authored and Ingo Molnar committed May 7, 2012
1 parent 396e2c6 commit b2d6aba
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion arch/x86/kernel/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,18 @@ static int hpet_verbose;

static int __init hpet_setup(char *str)
{
if (str) {
while (str) {
char *next = strchr(str, ',');

if (next)
*next++ = 0;
if (!strncmp("disable", str, 7))
boot_hpet_disable = 1;
if (!strncmp("force", str, 5))
hpet_force_user = 1;
if (!strncmp("verbose", str, 7))
hpet_verbose = 1;
str = next;
}
return 1;
}
Expand Down

0 comments on commit b2d6aba

Please sign in to comment.