lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asm-generic: rename page.h and uaccess.h

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2009-05-13 22:56:30 +00:00
committed by Arnd Bergmann
parent 72099ed271
commit 5b17e1cd89
25 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/include/asm/page.h
View File

@@ -93,6 +93,6 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ALPHA_PAGE_H */ #endif /* _ALPHA_PAGE_H */

2
arch/arm/include/asm/page.h
View File

@@ -202,6 +202,6 @@ typedef struct page *pgtable_t;
(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif #endif

2
arch/blackfin/include/asm/page.h
View File

@@ -81,7 +81,7 @@ extern unsigned long memory_end;
#define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
((void *)(kaddr) < (void *)memory_end)) ((void *)(kaddr) < (void *)memory_end))
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

2
arch/cris/include/asm/page.h
View File

@@ -68,7 +68,7 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _CRIS_PAGE_H */ #endif /* _CRIS_PAGE_H */

2
arch/frv/include/asm/page.h
View File

@@ -73,6 +73,6 @@ extern unsigned long max_pfn;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_PAGE_H */ #endif /* _ASM_PAGE_H */

2
arch/h8300/include/asm/page.h
View File

@@ -73,6 +73,6 @@ extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _H8300_PAGE_H */ #endif /* _H8300_PAGE_H */

2
arch/m32r/include/asm/page.h
View File

@@ -82,6 +82,6 @@ typedef struct page *pgtable_t;
#define devmem_is_allowed(x) 1 #define devmem_is_allowed(x) 1
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_M32R_PAGE_H */ #endif /* _ASM_M32R_PAGE_H */

2
arch/m68k/include/asm/page_mm.h
View File

@@ -223,6 +223,6 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _M68K_PAGE_H */ #endif /* _M68K_PAGE_H */

2
arch/m68k/include/asm/page_no.h
View File

@@ -72,6 +72,6 @@ extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _M68KNOMMU_PAGE_H */ #endif /* _M68KNOMMU_PAGE_H */

2
arch/microblaze/include/asm/page.h
View File

@@ -135,6 +135,6 @@ extern unsigned int memory_size;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_MICROBLAZE_PAGE_H */ #endif /* _ASM_MICROBLAZE_PAGE_H */

2
arch/mips/include/asm/page.h
View File

@@ -189,6 +189,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET) #define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_PAGE_H */ #endif /* _ASM_PAGE_H */

2
arch/parisc/include/asm/page.h
View File

@@ -159,6 +159,6 @@ extern int npmem_ranges;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _PARISC_PAGE_H */ #endif /* _PARISC_PAGE_H */

2
arch/parisc/include/asm/uaccess.h
View File

@@ -7,7 +7,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm-generic/uaccess.h> #include <asm-generic/uaccess-unaligned.h>
#define VERIFY_READ 0 #define VERIFY_READ 0
#define VERIFY_WRITE 1 #define VERIFY_WRITE 1

2
arch/powerpc/include/asm/page_32.h
View File

@@ -41,7 +41,7 @@ extern void clear_pages(void *page, int order);
static inline void clear_page(void *page) { clear_pages(page, 0); } static inline void clear_page(void *page) { clear_pages(page, 0); }
extern void copy_page(void *to, void *from); extern void copy_page(void *to, void *from);
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1) #define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1) #define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)

2
arch/powerpc/include/asm/page_64.h
View File

@@ -180,6 +180,6 @@ do { \
(test_thread_flag(TIF_32BIT) ? \ (test_thread_flag(TIF_32BIT) ? \
VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _ASM_POWERPC_PAGE_64_H */ #endif /* _ASM_POWERPC_PAGE_64_H */

2
arch/s390/include/asm/page.h
View File

@@ -150,7 +150,7 @@ void arch_alloc_page(struct page *page, int order);
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#define __HAVE_ARCH_GATE_AREA 1 #define __HAVE_ARCH_GATE_AREA 1

2
arch/sh/include/asm/page.h
View File

@@ -163,7 +163,7 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
/* vDSO support */ /* vDSO support */
#ifdef CONFIG_VSYSCALL #ifdef CONFIG_VSYSCALL

2
arch/sparc/include/asm/page_32.h
View File

@@ -152,6 +152,6 @@ extern unsigned long pfn_base;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _SPARC_PAGE_H */ #endif /* _SPARC_PAGE_H */

2
arch/sparc/include/asm/page_64.h
View File

@@ -132,6 +132,6 @@ typedef struct page *pgtable_t;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* _SPARC64_PAGE_H */ #endif /* _SPARC64_PAGE_H */

2
arch/sparc/include/asm/uaccess_64.h
View File

@@ -12,7 +12,7 @@
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm-generic/uaccess.h> #include <asm-generic/uaccess-unaligned.h>
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__

2
arch/um/include/asm/page.h
View File

@@ -116,7 +116,7 @@ extern unsigned long uml_physmem;
#define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v))) #define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __UM_PAGE_H */ #endif /* __UM_PAGE_H */

2
arch/x86/include/asm/page.h
View File

@@ -56,7 +56,7 @@ extern bool __virt_addr_valid(unsigned long kaddr);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h> #include <asm-generic/memory_model.h>
#include <asm-generic/page.h> #include <asm-generic/getorder.h>
#define __HAVE_ARCH_GATE_AREA 1 #define __HAVE_ARCH_GATE_AREA 1

2
arch/xtensa/include/asm/page.h
View File

@@ -129,7 +129,7 @@ static inline __attribute_const__ int get_order(unsigned long size)
#else #else
# include <asm-generic/page.h> # include <asm-generic/getorder.h>
#endif #endif

8
include/asm-generic/page.h → include/asm-generic/getorder.h
View File

@@ -1,12 +1,12 @@
#ifndef _ASM_GENERIC_PAGE_H #ifndef __ASM_GENERIC_GETORDER_H
#define _ASM_GENERIC_PAGE_H #define __ASM_GENERIC_GETORDER_H
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/compiler.h> #include <linux/compiler.h>
/* Pure 2^n version of get_order */ /* Pure 2^n version of get_order */
static __inline__ __attribute_const__ int get_order(unsigned long size) static inline __attribute_const__ int get_order(unsigned long size)
{ {
int order; int order;
@@ -21,4 +21,4 @@ static __inline__ __attribute_const__ int get_order(unsigned long size)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_GENERIC_PAGE_H */ #endif /* __ASM_GENERIC_GETORDER_H */

6
include/asm-generic/uaccess.h → include/asm-generic/uaccess-unaligned.h
View File

@@ -1,5 +1,5 @@
#ifndef _ASM_GENERIC_UACCESS_H_ #ifndef __ASM_GENERIC_UACCESS_UNALIGNED_H
#define _ASM_GENERIC_UACCESS_H_ #define __ASM_GENERIC_UACCESS_UNALIGNED_H
/* /*
* This macro should be used instead of __get_user() when accessing * This macro should be used instead of __get_user() when accessing
@@ -23,4 +23,4 @@
__copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \ __copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \
}) })
#endif /* _ASM_GENERIC_UACCESS_H */ #endif /* __ASM_GENERIC_UACCESS_UNALIGNED_H */