From 26a1cef63b011f23b4d7d184c2e45d6847c8784c Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Mon, 15 Jun 2009 09:34:49 +0000
Subject: [PATCH] removed redundant (now) compilation directives
---
bochs/cpu/paging.cc | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/bochs/cpu/paging.cc b/bochs/cpu/paging.cc
index d5ca12113..5316abb0a 100644
--- a/bochs/cpu/paging.cc
+++ b/bochs/cpu/paging.cc
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// $Id: paging.cc,v 1.177 2009-06-15 09:30:56 sshwarts Exp $
+// $Id: paging.cc,v 1.178 2009-06-15 09:34:49 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@@ -904,10 +904,8 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, bx_address &lpf_
if (!priv_check[priv_index] || nx_fault)
page_fault(ERROR_PROTECTION, laddr, pl, rw);
-#if BX_CPU_LEVEL >= 6
if (BX_CPU_THIS_PTR cr4.get_PGE())
combined_access |= (pde & 0x100); // G
-#endif
#if BX_SUPPORT_X86_64
if (long_mode()) {
@@ -967,10 +965,8 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, bx_address &lpf_
if (!priv_check[priv_index] || nx_fault)
page_fault(ERROR_PROTECTION, laddr, pl, rw);
-#if BX_CPU_LEVEL >= 6
if (BX_CPU_THIS_PTR cr4.get_PGE())
combined_access |= (pte & 0x100); // G
-#endif
#if BX_SUPPORT_X86_64
if (long_mode()) {