aa64: finalise context switch, page fault handler and syscall

[lunaix-os.git] / lunaix-os / arch / aarch64 / includes / asm / bits.h

diff --git a/lunaix-os/arch/aarch64/includes/asm/bits.h b/lunaix-os/arch/aarch64/includes/asm/bits.h
index a30f254bf0a9a267ee0b13fd150a333459919b70..9e2e319f6014013dca27a987463d99a9b5d8aa87 100644 (file)
--- a/lunaix-os/arch/aarch64/includes/asm/bits.h
+++ b/lunaix-os/arch/aarch64/includes/asm/bits.h
@@ -3,6 +3,7 @@
 
 #include <asm-generic/bits.h>
 
 
 #include <asm-generic/bits.h>
 

+#ifndef __ASM__

 #undef _BITS_EXTRACT
 #undef _BITS_INSERT
 
 #undef _BITS_EXTRACT
 #undef _BITS_INSERT
 


@@ -11,8 +12,8 @@
             unsigned long _r;           \
             asm ("ubfm %0, %1, %2, %3"  \
                  : "=r"(_r)             \
             unsigned long _r;           \
             asm ("ubfm %0, %1, %2, %3"  \
                  : "=r"(_r)             \

-                 : "r"(from)            \
-                   "i"(l) "i"(h));      \
+                 : "r"(from),           \
+                   "i"(l),"i"(h));      \

             _r;                         \
         })
 
             _r;                         \
         })
 


@@ -21,11 +22,11 @@
             unsigned long _r = to;      \
             asm ("bfi %0, %1, %2, %3"   \
                  : "=r"(_r)             \
             unsigned long _r = to;      \
             asm ("bfi %0, %1, %2, %3"   \
                  : "=r"(_r)             \

-                 : "r"(from)            \
-                   "i"(l)               \
+                 : "r"(from),           \
+                   "i"(l),              \

                    "i"(h - l + 1));     \
             _r;                         \
         })
 
                    "i"(h - l + 1));     \
             _r;                         \
         })
 

-
+#endif

 #endif /* __LUNAIX_ARCH_BITS_H */
 #endif /* __LUNAIX_ARCH_BITS_H */