Changeset 6be2c13 in mainline for kernel/generic/include/mm/mm.h

Timestamp:

2018-03-16T20:58:20Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

973be387 (diff), 4b1c7c6f (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-16 20:58:20)

git-committer:

GitHub <noreply@…> (2018-03-16 20:58:20)

Message:

Merge 4b1c7c6ff1e7b982f389a8f841b71af2a85e8cfb into 973be38782462a672111ff6833f8dbb40d2a44bf

File:

• kernel/generic/include/mm/mm.h (modified) (1 diff)

kernel/generic/include/mm/mm.h

@@ -37 +37 @@
 
 #define PAGE_CACHEABLE_SHIFT            0
-#define PAGE_NOT_CACHEABLE_SHIFT        PAGE_CACHEABLE_SHIFT
-#define PAGE_PRESENT_SHIFT              1
-#define PAGE_NOT_PRESENT_SHIFT          PAGE_PRESENT_SHIFT
+#define PAGE_NOT_PRESENT_SHIFT          1
 #define PAGE_USER_SHIFT                 2
-#define PAGE_KERNEL_SHIFT               PAGE_USER_SHIFT
-#define PAGE_READ_SHIFT                 3
 #define PAGE_WRITE_SHIFT                4
 #define PAGE_EXEC_SHIFT                 5
 #define PAGE_GLOBAL_SHIFT               6
 
-#define PAGE_NOT_CACHEABLE              (0 << PAGE_CACHEABLE_SHIFT)
 #define PAGE_CACHEABLE                  (1 << PAGE_CACHEABLE_SHIFT)
-
-#define PAGE_PRESENT                    (0 << PAGE_PRESENT_SHIFT)
-#define PAGE_NOT_PRESENT                (1 << PAGE_PRESENT_SHIFT)
-
+#define PAGE_NOT_PRESENT                (1 << PAGE_NOT_PRESENT_SHIFT)
 #define PAGE_USER                       (1 << PAGE_USER_SHIFT)
-#define PAGE_KERNEL                     (0 << PAGE_USER_SHIFT)
-
-#define PAGE_READ                       (1 << PAGE_READ_SHIFT)
 #define PAGE_WRITE                      (1 << PAGE_WRITE_SHIFT)
 #define PAGE_EXEC                       (1 << PAGE_EXEC_SHIFT)
-
 #define PAGE_GLOBAL                     (1 << PAGE_GLOBAL_SHIFT)