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/microblaze/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/microblaze/include/asm/page.h')
| -rw-r--r-- | arch/microblaze/include/asm/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index cf377d91da71..ed9d0f6e2cdb 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h | |||
| @@ -205,9 +205,6 @@ extern int page_is_ram(unsigned long pfn); | |||
| 205 | #define TOPHYS(addr) __virt_to_phys(addr) | 205 | #define TOPHYS(addr) __virt_to_phys(addr) |
| 206 | 206 | ||
| 207 | #ifdef CONFIG_MMU | 207 | #ifdef CONFIG_MMU |
| 208 | #ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC | ||
| 209 | #define WANT_PAGE_VIRTUAL 1 /* page alloc 2 relies on this */ | ||
| 210 | #endif | ||
| 211 | 208 | ||
| 212 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 209 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
| 213 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 210 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |