Changeset b5e68c8 in mainline for kernel/arch/amd64/include/cpu.h

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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.

Message:

Merge mainline changes.

File:

• kernel/arch/amd64/include/cpu.h (modified) (1 diff)

kernel/arch/amd64/include/cpu.h

@@ -36 +36 @@
 #define KERN_amd64_CPU_H_
 
-#define RFLAGS_CF       (1 << 0)
-#define RFLAGS_PF       (1 << 2)
-#define RFLAGS_AF       (1 << 4)
-#define RFLAGS_ZF       (1 << 6)
-#define RFLAGS_SF       (1 << 7)
-#define RFLAGS_TF       (1 << 8)
-#define RFLAGS_IF       (1 << 9)
-#define RFLAGS_DF       (1 << 10)
-#define RFLAGS_OF       (1 << 11)
-#define RFLAGS_NT       (1 << 14)
-#define RFLAGS_RF       (1 << 16)
+#define RFLAGS_CF  (1 << 0)
+#define RFLAGS_PF  (1 << 2)
+#define RFLAGS_AF  (1 << 4)
+#define RFLAGS_ZF  (1 << 6)
+#define RFLAGS_SF  (1 << 7)
+#define RFLAGS_TF  (1 << 8)
+#define RFLAGS_IF  (1 << 9)
+#define RFLAGS_DF  (1 << 10)
+#define RFLAGS_OF  (1 << 11)
+#define RFLAGS_NT  (1 << 14)
+#define RFLAGS_RF  (1 << 16)
 
 #define EFER_MSR_NUM    0xc0000080