From fae5a01c961b935adc451603c16f1883198d9d76 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 19 Dec 2007 23:20:19 +0100
Subject: [PATCH] --- yaml --- r: 75098 b: refs/heads/master c:
 3d054f0fade192b454592817c16e0f49e3e295dc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2697133bca69..d7e1e9ab2180 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3446fa057c33b5464ba6891866c24cd57daf023c
+refs/heads/master: 3d054f0fade192b454592817c16e0f49e3e295dc
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
index e1e18c34c821..9c24b45b513c 100644
--- a/trunk/arch/x86/kernel/setup_32.c
+++ b/trunk/arch/x86/kernel/setup_32.c
@@ -67,7 +67,7 @@
    address, and must not be in the .bss segment! */
 unsigned long init_pg_tables_end __initdata = ~0UL;
 
-int disable_pse __devinitdata = 0;
+int disable_pse __cpuinitdata = 0;
 
 /*
  * Machine setup..