From d8409bf8347d889983fe4709904e152d6b076b79 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Wed, 10 Jan 2007 23:15:36 -0800
Subject: [PATCH] --- yaml --- r: 45476 b: refs/heads/master c:
 664c0d3d575946bce24ecf5b7f93ee9541e4caf3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/kernel/tsc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 90264c0ed36d..8782f72d4df0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c61a446a1cab4280404798e335655266c1a4929
+refs/heads/master: 664c0d3d575946bce24ecf5b7f93ee9541e4caf3
diff --git a/trunk/arch/i386/kernel/tsc.c b/trunk/arch/i386/kernel/tsc.c
index 1bbe45dca7a0..2cfc7b09b925 100644
--- a/trunk/arch/i386/kernel/tsc.c
+++ b/trunk/arch/i386/kernel/tsc.c
@@ -24,7 +24,7 @@
  */
 unsigned int tsc_khz;
 
-int tsc_disable __cpuinitdata = 0;
+int tsc_disable;
 
 #ifdef CONFIG_X86_TSC
 static int __init tsc_setup(char *str)