Changeset ebb1489 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/arch/ia32/src/ia32.c (modified) (2 diffs)

kernel/arch/ia32/src/ia32.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2001-2004 Jakub Jermar
- * Copyright (c) 2009 Jiri Svoboda
  * Copyright (c) 2009 Martin Decky
  * All rights reserved.
@@ -106 +106 @@
         pm_init();
 
+#ifndef PROCESSOR_i486
         /* Use PCD+PWT bit combination in PTE to mean write-combining mode. */
         if (pat_supported())
                 pat_set_mapping(false, true, true, PAT_TYPE_WRITE_COMBINING);
+#endif
 
         if (config.cpu_active == 1) {