Changeset 2c86f81 in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2011-04-17T18:54:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3ac69647

Parents:

b4dc35a

Message:

Writable ELF segments need to be reserved memory regardless of whether
some pages are anonymous or not.

File:

• kernel/generic/src/mm/backend_elf.c (modified) (3 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -75 +75 @@
         size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
 
+        if (entry->p_flags & PF_W)
+                nonanon_pages = 0;
+
         if (area->pages <= nonanon_pages)
                 return true;
@@ -85 +88 @@
         elf_segment_header_t *entry = area->backend_data.segment;
         size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
+
+        if (entry->p_flags & PF_W)
+                nonanon_pages = 0;
 
         if (new_pages > area->pages) {
@@ -195 +201 @@
         elf_segment_header_t *entry = area->backend_data.segment;
         size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
+
+        if (entry->p_flags & PF_W)
+                nonanon_pages = 0;
 
         if (area->pages > nonanon_pages)