diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
| commit | 20234989a8ae0ff418e2acdef72205fb7cb3f819 (patch) | |
| tree | 6888e6c6b8f2beef67b3f85570aebb853f8443f9 /include/linux/mm.h | |
| parent | 92f268e034faf793f6d40de2f0fc81478a14ff39 (diff) | |
| parent | 49d7bc64283970ee83d2c954d04ba00d04e5943d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 29f02d8513f6..e5677f456742 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -163,7 +163,6 @@ extern unsigned int kobjsize(const void *objp); | |||
| 163 | #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ | 163 | #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ |
| 164 | #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ | 164 | #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ |
| 165 | #define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ | 165 | #define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ |
| 166 | #define VM_INCOMPLETE 0x02000000 /* Strange partial PFN mapping marker */ | ||
| 167 | 166 | ||
| 168 | #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ | 167 | #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ |
| 169 | #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS | 168 | #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS |