git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-i386
/
mach-summit
/
mach_mpparse.h
diff --git
a/include/asm-i386/mach-summit/mach_mpparse.h
b/include/asm-i386/mach-summit/mach_mpparse.h
index
1cce2b9
..
9426839
100644
(file)
--- a/
include/asm-i386/mach-summit/mach_mpparse.h
+++ b/
include/asm-i386/mach-summit/mach_mpparse.h
@@
-2,6
+2,7
@@
#define __ASM_MACH_MPPARSE_H
#include <mach_apic.h>
#define __ASM_MACH_MPPARSE_H
#include <mach_apic.h>
+#include <asm/tsc.h>
extern int use_cyclone;
extern int use_cyclone;
@@
-29,6
+30,7
@@
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
(!strncmp(productid, "VIGIL SMP", 9)
|| !strncmp(productid, "EXA", 3)
|| !strncmp(productid, "RUTHLESS SMP", 12))){
(!strncmp(productid, "VIGIL SMP", 9)
|| !strncmp(productid, "EXA", 3)
|| !strncmp(productid, "RUTHLESS SMP", 12))){
+ mark_tsc_unstable();
use_cyclone = 1; /*enable cyclone-timer*/
setup_summit();
return 1;
use_cyclone = 1; /*enable cyclone-timer*/
setup_summit();
return 1;
@@
-42,6
+44,7
@@
static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
if (!strncmp(oem_id, "IBM", 3) &&
(!strncmp(oem_table_id, "SERVIGIL", 8)
|| !strncmp(oem_table_id, "EXA", 3))){
if (!strncmp(oem_id, "IBM", 3) &&
(!strncmp(oem_table_id, "SERVIGIL", 8)
|| !strncmp(oem_table_id, "EXA", 3))){
+ mark_tsc_unstable();
use_cyclone = 1; /*enable cyclone-timer*/
setup_summit();
return 1;
use_cyclone = 1; /*enable cyclone-timer*/
setup_summit();
return 1;