Merge pull request #8 from rouseabout/fixes

GRUB compatibility; Fix typo

mentos/inc/descriptor_tables/gdt.h

@@ -93,7 +93,7 @@ enum gdt_bits_t {
     GDT_GRANULARITY = 128U,
     /// @brief `0b01000000U` (Size): If 0 the selector defines 16 bit protected mode. If 1 it defines 32 bit protected mode. You can have both 16 bit and 32 bit selectors at once.
     GDT_OPERAND_SIZE = 64U,
-} gdt_bits_t;
+};
 
 /// @brief Used in IDT for padding.
 #define IDT_PADDING 14U // `0b00001110U

mentos/src/boot.S

@@ -23,7 +23,7 @@ MULTIBOOT_VIDEO_MODE  equ 0x00000004
 
 ; This is the flag combination that we prepare for Grub
 ; to read at kernel load time.
-MULTIBOOT_HEADER_FLAGS  equ (MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_MODE)
+MULTIBOOT_HEADER_FLAGS  equ (MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO)
 ; Grub reads this value to make sure it loads a kernel
 ; and not just garbage.
 MULTIBOOT_CHECKSUM      equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)

mentos/src/process/scheduler.c

@@ -352,7 +352,7 @@ int sys_setgid(pid_t gid)
     }
 
     if (curr->gid == curr->pid)
-        pr_debug("Process %d is already a session leader.", task->pid);
+        pr_debug("Process %d is already a session leader.", curr->pid);
 
     curr->gid = curr->pid;
     return 0;