diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 16:29:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 16:29:47 -0800 |
| commit | 401221501af4b87b502eca36ece97b4191380082 (patch) | |
| tree | d67687b4ceb8c78213296039cafe8602514e4cd3 /include/asm-ia64/page.h | |
| parent | 63f45b80947cb0819673860f6970f483e2cab21d (diff) | |
| parent | ff51224cab12845c8bd539ca1f2dc18cc851b445 (diff) | |
| download | kernel_samsung_smdk4412-401221501af4b87b502eca36ece97b4191380082.zip kernel_samsung_smdk4412-401221501af4b87b502eca36ece97b4191380082.tar.gz kernel_samsung_smdk4412-401221501af4b87b502eca36ece97b4191380082.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/page.h')
| -rw-r--r-- | include/asm-ia64/page.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 9d41548..9dd9da1 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -47,8 +47,6 @@ #define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */ #define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT) -#define RGN_MAP_LIMIT ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE) /* per region addr limit */ - #ifdef CONFIG_HUGETLB_PAGE # define HPAGE_REGION_BASE RGN_BASE(RGN_HPAGE) @@ -175,11 +173,17 @@ get_order (unsigned long size) */ typedef struct { unsigned long pte; } pte_t; typedef struct { unsigned long pmd; } pmd_t; +#ifdef CONFIG_PGTABLE_4 + typedef struct { unsigned long pud; } pud_t; +#endif typedef struct { unsigned long pgd; } pgd_t; typedef struct { unsigned long pgprot; } pgprot_t; # define pte_val(x) ((x).pte) # define pmd_val(x) ((x).pmd) +#ifdef CONFIG_PGTABLE_4 +# define pud_val(x) ((x).pud) +#endif # define pgd_val(x) ((x).pgd) # define pgprot_val(x) ((x).pgprot) |