diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-24 19:38:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-24 19:38:52 -0400 |
| commit | 1126388609dee3f2aca2a64de7b0709d0fede785 (patch) | |
| tree | 4ab6b74ddcc7d4d1743b87efaf943da1e32fbcfe /include | |
| parent | 08ec3c2d45bac41c782acb4e3331ac5881b2c68a (diff) | |
| parent | 5291925a9a65ea334f6e887d0f01dd119b8e2b2e (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fixe the definition of PTRS_PER_PGD
[MIPS] au1000: Fix gpio direction
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/pgtable-32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 4396e9ffd418..55813d6150c7 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h | |||
| @@ -57,7 +57,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, | |||
| 57 | #define PMD_ORDER 1 | 57 | #define PMD_ORDER 1 |
| 58 | #define PTE_ORDER 0 | 58 | #define PTE_ORDER 0 |
| 59 | 59 | ||
| 60 | #define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t)) | 60 | #define PTRS_PER_PGD (USER_PTRS_PER_PGD * 2) |
| 61 | #define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) | 61 | #define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) |
| 62 | 62 | ||
| 63 | #define USER_PTRS_PER_PGD (0x80000000UL/PGDIR_SIZE) | 63 | #define USER_PTRS_PER_PGD (0x80000000UL/PGDIR_SIZE) |