Commit-ID: 5400743db5a06a4e6e298725a2044c40edcb27b9
Gitweb: http://git.kernel.org/tip/5400743db5a06a4e6e298725a2044c40edcb27b9
Author: H. Peter Anvin <hpa@xxxxxxxxx>
AuthorDate: Fri, 21 Aug 2009 17:00:02 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Fri, 21 Aug 2009 17:00:02 -0700
x86, mtrr: make mtrr_aps_delayed_init static bool
mtr_aps_delayed_init was declared u32 and made global, but it only
ever takes boolean values and is only ever used in
arch/x86/kernel/cpu/mtrr/main.c. Declare it "static bool" and remove
external references.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
---
arch/x86/include/asm/mtrr.h | 1 -
arch/x86/kernel/cpu/mtrr/main.c | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
index d5366ec..4365ffd 100644
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
@@ -126,7 +126,6 @@ extern void mtrr_aps_init(void);
extern void mtrr_bp_restore(void);
extern int mtrr_trim_uncached_memory(unsigned long end_pfn);
extern int amd_special_default_mtrr(void);
-extern u32 mtrr_aps_delayed_init;
# else
static inline u8 mtrr_type_lookup(u64 addr, u64 end)
{
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 7339be0..84e83de 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -58,7 +58,7 @@ unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
-u32 mtrr_aps_delayed_init;
+static bool mtrr_aps_delayed_init;
static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
@@ -758,7 +758,7 @@ void set_mtrr_aps_delayed_init(void)
if (!use_intel())
return;
- mtrr_aps_delayed_init = 1;
+ mtrr_aps_delayed_init = true;
}
/*
@@ -770,7 +770,7 @@ void mtrr_aps_init(void)
return;
set_mtrr(~0U, 0, 0, 0);
- mtrr_aps_delayed_init = 0;
+ mtrr_aps_delayed_init = false;
}
void mtrr_bp_restore(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|