Changeset 7bf29e5 in mainline for kernel/generic/include/align.h

Timestamp:

2025-01-09T11:29:38Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a5c2960e

Parents:

bc3d695 (diff), 4e1221c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• kernel/generic/include/align.h (modified) (3 diffs)

kernel/generic/include/align.h

@@ -39 +39 @@
 #define KERN_ALIGN_H_
 
+#ifdef __ASSEMBLER__
+#define ALIGN_DOWN(s, a)  ((s) & ~((a) - 1))
+#define ALIGN_UP(s, a)    (((s) + ((a) - 1)) & ~((a) - 1))
+#else
+
 /** Align to the nearest lower address.
  *
@@ -44 +49 @@
  * @param a Size of alignment, must be a power of 2.
  */
-#define ALIGN_DOWN(s, a)  ((s) & ~((a) - 1))
+#define ALIGN_DOWN(s, a)  ((s) & ~((typeof(s))(a) - 1))
 
 /** Align to the nearest higher address.
@@ -51 +56 @@
  * @param a Size of alignment, must be a power of 2.
  */
-#define ALIGN_UP(s, a)  (((s) + ((a) - 1)) & ~((a) - 1))
+#define ALIGN_UP(s, a)  (((s) + ((a) - 1)) & ~((typeof(s))(a) - 1))
+
+#endif
 
 /** Check alignment.