lkml.org 
[lkml]   [2008]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [patch 00/13] x86: PAT support updated - v3

* Ingo Molnar <mingo@elte.hu> wrote:

> > The patchset is against x86 testing from couple of days back.
>
> thanks Venki, i've queued this up so that we can see how well it goes.
> It now looks a lot less dangerous and more compatible than it did
> before - but i'm sure there'll be issues nevertheless :-/

no big issues so far, just a simple build fix for the !MTRR case below.

Ingo

----------------->
Subject: x86: PAT fix
From: Ingo Molnar <mingo@elte.hu>
Date: Fri Mar 21 15:42:28 CET 2008
build fix for !CONFIG_MTRR.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/asm-x86/mtrr.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Index: linux-x86.q/include/asm-x86/mtrr.h
===================================================================
--- linux-x86.q.orig/include/asm-x86/mtrr.h
+++ linux-x86.q/include/asm-x86/mtrr.h
@@ -84,10 +84,9 @@ struct mtrr_gentry

#ifdef __KERNEL__

-extern u8 mtrr_type_lookup(u64 addr, u64 end);
-
/* The following functions are for use by other drivers */
# ifdef CONFIG_MTRR
+extern u8 mtrr_type_lookup(u64 addr, u64 end);
extern void mtrr_save_fixed_ranges(void *);
extern void mtrr_save_state(void);
extern int mtrr_add (unsigned long base, unsigned long size,
@@ -101,6 +100,13 @@ extern void mtrr_ap_init(void);
extern void mtrr_bp_init(void);
extern int mtrr_trim_uncached_memory(unsigned long end_pfn);
# else
+static inline u8 mtrr_type_lookup(u64 addr, u64 end)
+{
+ /*
+ * Return no-MTRRs:
+ */
+ return 0xff;
+}
#define mtrr_save_fixed_ranges(arg) do {} while (0)
#define mtrr_save_state() do {} while (0)
static __inline__ int mtrr_add (unsigned long base, unsigned long size,

\
 
 \ /
  Last update: 2008-03-21 15:59    [from the cache]
©2003-2011 Jasper Spaans