Remove leftovers from new IRQ system cherrypick

diff --git a/Makefile b/Makefile
index c3510938c72abeee53245b818c089643614c2dad..5d8c1ebb6dba7518b570733a9d170f1eba2ecf37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,9 +39,6 @@ boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN bo
        mcopy -i boot/x86/disk.img@@1M boot/x86/stage3/LOADER.BIN ::.
        mcopy -i boot/x86/disk.img@@1M kernel/kernel.elf ::./KERNEL.ELF
 
-kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
-       $(CC) $(CFLAGS) -mgeneral-regs-only -c $< -o $@
-
 kernel/kernel.elf: $(KERNEL_OBJ)
        $(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -lgcc
        i686-elf-objcopy --only-keep-debug kernel/kernel.elf kernel/kernel.dbg

diff --git a/include/arch/x86/mm/paging.h b/include/arch/x86/mm/paging.h
deleted file mode 100644 (file)
index a4bdf22..0000000
--- a/include/arch/x86/mm/paging.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef X86_PAGING_H
-#define X86_PAGING_H
-
-struct page_directory_entry {
-       unsigned p: 1,
-                rw: 1,
-                us: 1,
-                pwt: 1,
-                pcd: 1,
-                a: 1,
-                ignored: 1,
-                ps: 1,
-                ignored2: 4,
-                page_table_addr: 20;
-} __attribute__((packed));
-
-struct page_table_entry {
-       unsigned p: 1,
-                rw: 1,
-                us: 1,
-                pwt: 1,
-                pcd: 1,
-                a: 1,
-                d: 1,
-                pat: 1,
-                g: 1,
-                ignored: 3,
-                page_frame_addr: 20;
-} __attribute__((packed));
-
-struct pf_errcode {
-       unsigned p: 1, wr: 1, us: 1, rsvd: 1, id: 1, pk: 1, ss: 1, hlat: 1, reserved: 7, sgx: 1, reserved2: 15;
-} __attribute__((packed));
-
-#endif