Bläddra i källkod

bpf: Be consistent with arm target_arch

This is `arm` in bindings but `armv7` in args.
Let's use `arm`

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Dave Tucker 3 år sedan
förälder
incheckning
218d4842d6
1 ändrade filer med 3 tillägg och 3 borttagningar
  1. 3 3
      bpf/aya-bpf/src/args.rs

+ 3 - 3
bpf/aya-bpf/src/args.rs

@@ -116,7 +116,7 @@ impl<T> FromPtRegs for *const T {
     }
     }
 }
 }
 
 
-#[cfg(bpf_target_arch = "armv7")]
+#[cfg(bpf_target_arch = "arm")]
 impl<T> FromPtRegs for *const T {
 impl<T> FromPtRegs for *const T {
     fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
     fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
         if n <= 6 {
         if n <= 6 {
@@ -165,7 +165,7 @@ impl<T> FromPtRegs for *mut T {
     }
     }
 }
 }
 
 
-#[cfg(bpf_target_arch = "armv7")]
+#[cfg(bpf_target_arch = "arm")]
 impl<T> FromPtRegs for *mut T {
 impl<T> FromPtRegs for *mut T {
     fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
     fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
         if n <= 6 {
         if n <= 6 {
@@ -217,7 +217,7 @@ macro_rules! impl_from_pt_regs {
             }
             }
         }
         }
 
 
-        #[cfg(bpf_target_arch = "armv7")]
+        #[cfg(bpf_target_arch = "arm")]
         impl FromPtRegs for $type {
         impl FromPtRegs for $type {
             fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
             fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
                 if n <= 6 {
                 if n <= 6 {