From 5b91db9d764ae62e895781d6394f541135a3e116 Mon Sep 17 00:00:00 2001
From: WangRunji <wangrunji0408@163.com>
Date: Mon, 16 Apr 2018 00:27:45 +0800
Subject: [PATCH] Move interrupt mod

---
 src/arch/x86_64/driver/mod.rs             | 3 +--
 src/arch/x86_64/{driver => }/interrupt.rs | 0
 src/arch/x86_64/mod.rs                    | 1 +
 src/lib.rs                                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/arch/x86_64/{driver => }/interrupt.rs (100%)

diff --git a/src/arch/x86_64/driver/mod.rs b/src/arch/x86_64/driver/mod.rs
index 02e8e4b..5a93241 100644
--- a/src/arch/x86_64/driver/mod.rs
+++ b/src/arch/x86_64/driver/mod.rs
@@ -4,5 +4,4 @@ pub mod apic;
 pub mod mp;
 pub mod serial;
 pub mod pic;
-pub mod console;
-pub mod interrupt;
\ No newline at end of file
+pub mod console;
\ No newline at end of file
diff --git a/src/arch/x86_64/driver/interrupt.rs b/src/arch/x86_64/interrupt.rs
similarity index 100%
rename from src/arch/x86_64/driver/interrupt.rs
rename to src/arch/x86_64/interrupt.rs
diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
index a6322a3..5e97be4 100644
--- a/src/arch/x86_64/mod.rs
+++ b/src/arch/x86_64/mod.rs
@@ -1,5 +1,6 @@
 pub mod driver;
 pub mod cpu;
+pub mod interrupt;
 
 pub fn init() {
 	cpu::enable_nxe_bit();
diff --git a/src/lib.rs b/src/lib.rs
index 0dbf338..7202fd8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -86,7 +86,7 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) {
     } else {
         arch::driver::pic::init();
     }
-    arch::driver::interrupt::enable();
+    arch::interrupt::enable();
     loop{}
     test_end!();
 }