aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/getorder.h (renamed from include/asm-generic/page.h)8
-rw-r--r--include/asm-generic/uaccess-unaligned.h (renamed from include/asm-generic/uaccess.h)6
2 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-generic/page.h b/include/asm-generic/getorder.h
index 14db733b8e68..67e7245dc9b3 100644
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/getorder.h
@@ -1,12 +1,12 @@
1#ifndef _ASM_GENERIC_PAGE_H 1#ifndef __ASM_GENERIC_GETORDER_H
2#define _ASM_GENERIC_PAGE_H 2#define __ASM_GENERIC_GETORDER_H
3 3
4#ifndef __ASSEMBLY__ 4#ifndef __ASSEMBLY__
5 5
6#include <linux/compiler.h> 6#include <linux/compiler.h>
7 7
8/* Pure 2^n version of get_order */ 8/* Pure 2^n version of get_order */
9static __inline__ __attribute_const__ int get_order(unsigned long size) 9static inline __attribute_const__ int get_order(unsigned long size)
10{ 10{
11 int order; 11 int order;
12 12
@@ -21,4 +21,4 @@ static __inline__ __attribute_const__ int get_order(unsigned long size)
21 21
22#endif /* __ASSEMBLY__ */ 22#endif /* __ASSEMBLY__ */
23 23
24#endif /* _ASM_GENERIC_PAGE_H */ 24#endif /* __ASM_GENERIC_GETORDER_H */
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess-unaligned.h
index 549cb3a1640a..67deb898f0c5 100644
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess-unaligned.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_GENERIC_UACCESS_H_ 1#ifndef __ASM_GENERIC_UACCESS_UNALIGNED_H
2#define _ASM_GENERIC_UACCESS_H_ 2#define __ASM_GENERIC_UACCESS_UNALIGNED_H
3 3
4/* 4/*
5 * This macro should be used instead of __get_user() when accessing 5 * This macro should be used instead of __get_user() when accessing
@@ -23,4 +23,4 @@
23 __copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \ 23 __copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \
24}) 24})
25 25
26#endif /* _ASM_GENERIC_UACCESS_H */ 26#endif /* __ASM_GENERIC_UACCESS_UNALIGNED_H */