Changeset b8e72fd1 in mainline for kernel/arch/ia32/include/arch/pm.h
- Timestamp:
- 2013-05-30T17:13:02Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 98abd40
- Parents:
- be2bb4f (diff), 94dfb92 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia32/include/arch/pm.h
rbe2bb4f rb8e72fd1 50 50 51 51 #define VESA_INIT_SEGMENT 0x8000 52 #define VESA_INIT_DES 7 52 #define VESA_INIT_CODE_DES 7 53 #define VESA_INIT_DATA_DES 8 53 54 #define KTEXT32_DES KTEXT_DES 54 55 55 56 #undef GDT_ITEMS 56 #define GDT_ITEMS 857 #define GDT_ITEMS 9 57 58 58 59 #endif /* CONFIG_FB */ … … 67 68 #define AR_CODE (3 << 3) 68 69 #define AR_WRITABLE (1 << 1) 70 #define AR_READABLE (1 << 1) 69 71 #define AR_INTERRUPT (0xe) 70 72 #define AR_TRAP (0xf)
Note:
See TracChangeset
for help on using the changeset viewer.