diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/ia64/include/asm/page.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/ia64/include/asm/page.h')
| -rw-r--r-- | arch/ia64/include/asm/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h index 41b6d31110fd..961a16f43e6b 100644 --- a/arch/ia64/include/asm/page.h +++ b/arch/ia64/include/asm/page.h | |||
| @@ -189,6 +189,7 @@ get_order (unsigned long size) | |||
| 189 | # define pgprot_val(x) ((x).pgprot) | 189 | # define pgprot_val(x) ((x).pgprot) |
| 190 | 190 | ||
| 191 | # define __pte(x) ((pte_t) { (x) } ) | 191 | # define __pte(x) ((pte_t) { (x) } ) |
| 192 | # define __pmd(x) ((pmd_t) { (x) } ) | ||
| 192 | # define __pgprot(x) ((pgprot_t) { (x) } ) | 193 | # define __pgprot(x) ((pgprot_t) { (x) } ) |
| 193 | 194 | ||
| 194 | #else /* !STRICT_MM_TYPECHECKS */ | 195 | #else /* !STRICT_MM_TYPECHECKS */ |