diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 16:01:25 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 16:01:25 +0400 |
| commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
| tree | efceb246a4fa12921b7dbd3946a88fa257684405 /include/asm-arm/page.h | |
| parent | cd28ab6a4e50a7601d22752aa7ce0c8197b10bdf (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
| download | linux-d7f6884ae0ae6e406ec3500fcde16e8f51642460.tar.xz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-arm/page.h')
| -rw-r--r-- | include/asm-arm/page.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 019c45d75730..4da1d532cbeb 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -163,20 +163,6 @@ typedef unsigned long pgprot_t; /* the upper-most page table pointer */ extern pmd_t *top_pmd; -/* Pure 2^n version of get_order */ -static inline int get_order(unsigned long size) -{ - int order; - - size = (size-1) >> (PAGE_SHIFT-1); - order = -1; - do { - size >>= 1; - order++; - } while (size); - return order; -} - #include <asm/memory.h> #endif /* !__ASSEMBLY__ */ @@ -186,4 +172,6 @@ static inline int get_order(unsigned long size) #endif /* __KERNEL__ */ +#include <asm-generic/page.h> + #endif |