Merge branch 'upstream-merged'

1 files changed, 24 insertions, 0 deletions

diff --git a/libdde-linux26/libdde_linux26/contrib/include/asm-generic/page.h b/libdde-linux26/libdde_linux26/contrib/include/asm-generic/page.h
new file mode 100644
index 00000000..14db733b
--- /dev/null
+++ b/libdde-linux26/libdde_linux26/contrib/include/asm-generic/page.h
@@ -0,0 +1,24 @@
+#ifndef _ASM_GENERIC_PAGE_H
+#define _ASM_GENERIC_PAGE_H
+
+#ifndef __ASSEMBLY__
+
+#include <linux/compiler.h>
+
+/* Pure 2^n version of get_order */
+static __inline__ __attribute_const__ int get_order(unsigned long size)
+{
+	int order;
+
+	size = (size - 1) >> (PAGE_SHIFT - 1);
+	order = -1;
+	do {
+		size >>= 1;
+		order++;
+	} while (size);
+	return order;
+}
+
+#endif	/* __ASSEMBLY__ */
+
+#endif	/* _ASM_GENERIC_PAGE_H */