Skip to content

Commit

Permalink
x86: pat.c more trivial changes
Browse files Browse the repository at this point in the history
 - add BUG statement to catch invalid start and end parameters
 - No need to track the actual type in both req_type and actual_type --
   keep req_type unchanged.
 - removed (IMHO) superfluous comments

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Suresh B Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Andreas Herrmann authored and Ingo Molnar committed Jun 24, 2008
1 parent ac97991 commit 69e26be
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions arch/x86/mm/pat.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
unsigned long actual_type;
int err = 0;

/* Only track when pat_enabled */
BUG_ON(start >= end); /* end is exclusive */

if (!pat_enabled) {
/* This is identical to page table setting without PAT */
if (new_type) {
Expand Down Expand Up @@ -228,17 +229,13 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
*/
u8 mtrr_type = mtrr_type_lookup(start, end);

if (mtrr_type == MTRR_TYPE_WRBACK) {
req_type = _PAGE_CACHE_WB;
if (mtrr_type == MTRR_TYPE_WRBACK)
actual_type = _PAGE_CACHE_WB;
} else {
req_type = _PAGE_CACHE_UC_MINUS;
else
actual_type = _PAGE_CACHE_UC_MINUS;
}
} else {
req_type &= _PAGE_CACHE_MASK;
actual_type = pat_x_mtrr_type(start, end, req_type);
}
} else
actual_type = pat_x_mtrr_type(start, end,
req_type & _PAGE_CACHE_MASK);

new = kmalloc(sizeof(struct memtype), GFP_KERNEL);
if (!new)
Expand Down Expand Up @@ -406,10 +403,8 @@ int free_memtype(u64 start, u64 end)
struct memtype *entry;
int err = -EINVAL;

/* Only track when pat_enabled */
if (!pat_enabled) {
if (!pat_enabled)
return 0;
}

/* Low ISA region is always mapped WB. No need to track */
if (is_ISA_range(start, end - 1))
Expand Down

0 comments on commit 69e26be

Please sign in to comment.