diff options
author | Arnd Bergmann <arnd@arndb.de> | 2009-05-13 18:56:30 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@klappe2.(none)> | 2009-06-11 15:02:17 -0400 |
commit | 5b17e1cd8928ae65932758ce6478ac6d3e9a86b2 (patch) | |
tree | 065b3adc60a74ce0b3e3cd0fc447b8688b6d0332 /include/asm-generic | |
parent | 72099ed2719fc5829bd79c6ca9d1783ed026eb37 (diff) |
asm-generic: rename page.h and uaccess.h
The current asm-generic/page.h only contains the get_order
function, and asm-generic/uaccess.h only implements
unaligned accesses. This renames the file to getorder.h
and uaccess-unaligned.h to make room for new page.h
and uaccess.h file that will be usable by all simple
(e.g. nommu) architectures.
Signed-off-by: Remis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/asm-generic')
-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 */ |
9 | static __inline__ __attribute_const__ int get_order(unsigned long size) | 9 | static 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 */ |