Skip to content

Commit

Permalink
asm-generic: rename page.h and uaccess.h
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Arnd Bergmann authored and Arnd Bergmann committed Jun 11, 2009
1 parent 72099ed commit 5b17e1c
Show file tree
Hide file tree
Showing 25 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion arch/alpha/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _ALPHA_PAGE_H */
2 changes: 1 addition & 1 deletion arch/arm/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,6 @@ typedef struct page *pgtable_t;
(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif
2 changes: 1 addition & 1 deletion arch/blackfin/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extern unsigned long memory_end;
#define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
((void *)(kaddr) < (void *)memory_end))

#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* __ASSEMBLY__ */

Expand Down
2 changes: 1 addition & 1 deletion arch/cris/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _CRIS_PAGE_H */

2 changes: 1 addition & 1 deletion arch/frv/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ extern unsigned long max_pfn;
#endif /* __ASSEMBLY__ */

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _ASM_PAGE_H */
2 changes: 1 addition & 1 deletion arch/h8300/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _H8300_PAGE_H */
2 changes: 1 addition & 1 deletion arch/m32r/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ typedef struct page *pgtable_t;
#define devmem_is_allowed(x) 1

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _ASM_M32R_PAGE_H */
2 changes: 1 addition & 1 deletion arch/m68k/include/asm/page_mm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _M68K_PAGE_H */
2 changes: 1 addition & 1 deletion arch/m68k/include/asm/page_no.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ extern unsigned long memory_end;

#endif /* __ASSEMBLY__ */

#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _M68KNOMMU_PAGE_H */
2 changes: 1 addition & 1 deletion arch/microblaze/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,6 @@ extern unsigned int memory_size;
#endif /* __KERNEL__ */

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _ASM_MICROBLAZE_PAGE_H */
2 changes: 1 addition & 1 deletion arch/mips/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _ASM_PAGE_H */
2 changes: 1 addition & 1 deletion arch/parisc/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,6 @@ extern int npmem_ranges;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _PARISC_PAGE_H */
2 changes: 1 addition & 1 deletion arch/parisc/include/asm/uaccess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <asm/page.h>
#include <asm/system.h>
#include <asm/cache.h>
#include <asm-generic/uaccess.h>
#include <asm-generic/uaccess-unaligned.h>

#define VERIFY_READ 0
#define VERIFY_WRITE 1
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/page_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extern void clear_pages(void *page, int order);
static inline void clear_page(void *page) { clear_pages(page, 0); }
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 PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/page_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,6 @@ do { \
(test_thread_flag(TIF_32BIT) ? \
VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)

#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _ASM_POWERPC_PAGE_64_H */
2 changes: 1 addition & 1 deletion arch/s390/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void arch_alloc_page(struct page *page, int order);
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#define __HAVE_ARCH_GATE_AREA 1

Expand Down
2 changes: 1 addition & 1 deletion arch/sh/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ typedef struct page *pgtable_t;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

/* vDSO support */
#ifdef CONFIG_VSYSCALL
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/include/asm/page_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,6 @@ extern unsigned long pfn_base;
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _SPARC_PAGE_H */
2 changes: 1 addition & 1 deletion arch/sparc/include/asm/page_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ typedef struct page *pgtable_t;
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* _SPARC64_PAGE_H */
2 changes: 1 addition & 1 deletion arch/sparc/include/asm/uaccess_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <asm/asi.h>
#include <asm/system.h>
#include <asm/spitfire.h>
#include <asm-generic/uaccess.h>
#include <asm-generic/uaccess-unaligned.h>
#endif

#ifndef __ASSEMBLY__
Expand Down
2 changes: 1 addition & 1 deletion arch/um/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ extern unsigned long uml_physmem;
#define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#endif /* __ASSEMBLY__ */
#endif /* __UM_PAGE_H */
2 changes: 1 addition & 1 deletion arch/x86/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extern bool __virt_addr_valid(unsigned long kaddr);
#endif /* __ASSEMBLY__ */

#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/getorder.h>

#define __HAVE_ARCH_GATE_AREA 1

Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/include/asm/page.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static inline __attribute_const__ int get_order(unsigned long size)

#else

# include <asm-generic/page.h>
# include <asm-generic/getorder.h>

#endif

Expand Down
8 changes: 4 additions & 4 deletions include/asm-generic/page.h → include/asm-generic/getorder.h
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#ifndef _ASM_GENERIC_PAGE_H
#define _ASM_GENERIC_PAGE_H
#ifndef __ASM_GENERIC_GETORDER_H
#define __ASM_GENERIC_GETORDER_H

#ifndef __ASSEMBLY__

#include <linux/compiler.h>

/* 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;

Expand All @@ -21,4 +21,4 @@ static __inline__ __attribute_const__ int get_order(unsigned long size)

#endif /* __ASSEMBLY__ */

#endif /* _ASM_GENERIC_PAGE_H */
#endif /* __ASM_GENERIC_GETORDER_H */
6 changes: 3 additions & 3 deletions include/asm-generic/uaccess.h → include/asm-generic/uaccess-unaligned.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASM_GENERIC_UACCESS_H_
#define _ASM_GENERIC_UACCESS_H_
#ifndef __ASM_GENERIC_UACCESS_UNALIGNED_H
#define __ASM_GENERIC_UACCESS_UNALIGNED_H

/*
* This macro should be used instead of __get_user() when accessing
Expand All @@ -23,4 +23,4 @@
__copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \
})

#endif /* _ASM_GENERIC_UACCESS_H */
#endif /* __ASM_GENERIC_UACCESS_UNALIGNED_H */

0 comments on commit 5b17e1c

Please sign in to comment.