diff options
author | H. Peter Anvin <hpa@zytor.com> | 2007-07-18 20:19:30 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2007-07-25 15:02:21 -0400 |
commit | 238b706da1c6ebacc55986ac8668f3ede4621f2c (patch) | |
tree | e783783b364516eaa88e08a261ef7bc320db7355 /arch/i386/boot/main.c | |
parent | f77b1ab383c8745447a3385e25729b92f2ec58a4 (diff) |
[x86 setup] Make struct ist_info cross-architecture, and use in setup code
Make "struct ist_info" valid on both i386 and x86-64, and use the
structure by name in the setup code. Additionally, "Intel SpeedStep
IST" is redundant, refer to it as IST consistently.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/i386/boot/main.c')
-rw-r--r-- | arch/i386/boot/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/i386/boot/main.c b/arch/i386/boot/main.c index 7f01f96c4fb8..0eeef3989a17 100644 --- a/arch/i386/boot/main.c +++ b/arch/i386/boot/main.c | |||
@@ -73,15 +73,15 @@ static void keyboard_set_repeat(void) | |||
73 | } | 73 | } |
74 | 74 | ||
75 | /* | 75 | /* |
76 | * Get Intel SpeedStep IST information. | 76 | * Get Intel SpeedStep (IST) information. |
77 | */ | 77 | */ |
78 | static void query_speedstep_ist(void) | 78 | static void query_ist(void) |
79 | { | 79 | { |
80 | asm("int $0x15" | 80 | asm("int $0x15" |
81 | : "=a" (boot_params.speedstep_info[0]), | 81 | : "=a" (boot_params.ist_info.signature), |
82 | "=b" (boot_params.speedstep_info[1]), | 82 | "=b" (boot_params.ist_info.command), |
83 | "=c" (boot_params.speedstep_info[2]), | 83 | "=c" (boot_params.ist_info.event), |
84 | "=d" (boot_params.speedstep_info[3]) | 84 | "=d" (boot_params.ist_info.perf_level) |
85 | : "a" (0x0000e980), /* IST Support */ | 85 | : "a" (0x0000e980), /* IST Support */ |
86 | "d" (0x47534943)); /* Request value */ | 86 | "d" (0x47534943)); /* Request value */ |
87 | } | 87 | } |
@@ -144,8 +144,8 @@ void main(void) | |||
144 | query_voyager(); | 144 | query_voyager(); |
145 | #endif | 145 | #endif |
146 | 146 | ||
147 | /* Query SpeedStep IST information */ | 147 | /* Query Intel SpeedStep (IST) information */ |
148 | query_speedstep_ist(); | 148 | query_ist(); |
149 | 149 | ||
150 | /* Query APM information */ | 150 | /* Query APM information */ |
151 | #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) | 151 | #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) |