diff options
| author |  Gerd Zellweger <mail@gerdzellweger.com>
| 2017-11-15 12:38:53 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-11-15 12:38:53 +0100 |
| commit | 1e2efb6b7a0d76d9b672e09862515f5ac2541d9f (patch) | |
| tree | 1de68720694c91dd3aaf71286f53d0c995fcb746 | |
| parent | 7afc050be9266413f9104e51a59e061b9a918bbc (diff) | |
| parent | 7ee37f04538c7ded6f1ec4c8576a99fefa0d9fc3 (diff) | |
| download | rust-x86-1e2efb6b7a0d76d9b672e09862515f5ac2541d9f.tar.gz rust-x86-1e2efb6b7a0d76d9b672e09862515f5ac2541d9f.tar.zst rust-x86-1e2efb6b7a0d76d9b672e09862515f5ac2541d9f.zip | |
Merge pull request #37 from RWTH-OS/devel
move time.rs into the directory shared
| -rw-r--r-- | src/bits64/mod.rs | 1 | ||||
| -rw-r--r-- | src/shared/mod.rs | 1 | ||||
| -rw-r--r-- | src/shared/time.rs (renamed from src/bits64/time.rs) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/src/bits64/mod.rs b/src/bits64/mod.rs index 1fcb17e..7409435 100644 --- a/src/bits64/mod.rs +++ b/src/bits64/mod.rs @@ -15,7 +15,6 @@ macro_rules! check_flag { ) } -pub mod time; pub mod irq; pub mod paging; pub mod segmentation; diff --git a/src/shared/mod.rs b/src/shared/mod.rs index 8c81478..6ea7633 100644 --- a/src/shared/mod.rs +++ b/src/shared/mod.rs @@ -9,6 +9,7 @@ pub mod flags; pub mod segmentation; pub mod task; pub mod tlb; +pub mod time; pub mod cpuid { pub use raw_cpuid::*; diff --git a/src/bits64/time.rs b/src/shared/time.rs index eff567d..eff567d 100644 --- a/src/bits64/time.rs +++ b/src/shared/time.rs |