diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-04 15:56:15 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-04 15:56:15 -0500 |
| commit | a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e (patch) | |
| tree | 45692a1b3d770f721f4586ad81c206f1b8509b75 /arch/i386/kernel/numaq.c | |
| parent | 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd (diff) | |
| parent | 1c5ad84516ae7ea4ec868436a910a6bd8d20215a (diff) | |
| download | talos-obmc-linux-a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e.tar.gz talos-obmc-linux-a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e.zip | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'arch/i386/kernel/numaq.c')
| -rw-r--r-- | arch/i386/kernel/numaq.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/i386/kernel/numaq.c b/arch/i386/kernel/numaq.c index e51edf0a6564..5f5b075f860a 100644 --- a/arch/i386/kernel/numaq.c +++ b/arch/i386/kernel/numaq.c @@ -31,6 +31,7 @@ #include <linux/nodemask.h> #include <asm/numaq.h> #include <asm/topology.h> +#include <asm/processor.h> #define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT)) @@ -77,3 +78,11 @@ int __init get_memcfg_numaq(void) smp_dump_qct(); return 1; } + +static int __init numaq_dsc_disable(void) +{ + printk(KERN_DEBUG "NUMAQ: disabling TSC\n"); + tsc_disable = 1; + return 0; +} +core_initcall(numaq_dsc_disable); |
