aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-06 16:18:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-06 18:06:53 +0200
commit0962f402af1bb0b53ccee626785d202a10c12fff (patch)
tree26fa57193f16e45c6e0557049d02164f129077ed /arch/x86/kernel/cpu
parent19268ed7449c561694d048a34601a30e2d1aaf79 (diff)
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff)
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts: arch/x86/kernel/process_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/mtrr/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 885c8265e6b..5df16d81837 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -729,7 +729,7 @@ struct var_mtrr_range_state {
mtrr_type type;
};
-struct var_mtrr_range_state __initdata range_state[RANGE_NUM];
+static struct var_mtrr_range_state __initdata range_state[RANGE_NUM];
static int __initdata debug_print;
static int __init