diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-10-26 22:07:20 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-26 22:07:20 +0000 |
| commit | e42899b3ed5f6940a9acbe96776993049297cf4f (patch) | |
| tree | a68cc022356bbfa792802468fec484311291bcec /asm/inline.rs | |
| parent | 25f6613a6236d42d448d12b36557824a10ce7a77 (diff) | |
| parent | 18dca6f5b5a050b8450de52ee9d9879f70c7b058 (diff) | |
| download | cortex-m-e42899b3ed5f6940a9acbe96776993049297cf4f.tar.gz cortex-m-e42899b3ed5f6940a9acbe96776993049297cf4f.tar.zst cortex-m-e42899b3ed5f6940a9acbe96776993049297cf4f.zip | |
Merge #276
276: Set up GitHub Actions r=adamgreig a=jonas-schievink
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Diffstat (limited to 'asm/inline.rs')
| -rw-r--r-- | asm/inline.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/inline.rs b/asm/inline.rs index 688604e..f6a3ebb 100644 --- a/asm/inline.rs +++ b/asm/inline.rs @@ -6,7 +6,7 @@ //! All of these functions should be blanket-`unsafe`. `cortex-m` provides safe wrappers where //! applicable. -use core::sync::atomic::{Ordering, compiler_fence}; +use core::sync::atomic::{compiler_fence, Ordering}; #[inline(always)] pub unsafe fn __bkpt() { @@ -187,7 +187,7 @@ pub unsafe fn __syscall(mut nr: u32, arg: u32) -> u32 { pub use self::v7m::*; #[cfg(any(armv7m, armv8m_main))] mod v7m { - use core::sync::atomic::{Ordering, compiler_fence}; + use core::sync::atomic::{compiler_fence, Ordering}; #[inline(always)] pub unsafe fn __basepri_max(val: u8) { |