Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27955
b: refs/heads/master
c: 9cdcb56
h: refs/heads/master
i:
  27953: d87e4af
  27951: f7e0b87
v: v3
  • Loading branch information
David Woodhouse committed Apr 25, 2006
1 parent 15faabd commit e5339b9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e442735ae6e2e1c857fb0c746027da8d8e40a81
refs/heads/master: 9cdcb56636717ccb935dc66c5d56681eaa5941c1
13 changes: 8 additions & 5 deletions trunk/include/linux/mman.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#ifndef _LINUX_MMAN_H
#define _LINUX_MMAN_H

#include <linux/config.h>
#include <linux/mm.h>

#include <asm/atomic.h>
#include <asm/mman.h>

#define MREMAP_MAYMOVE 1
Expand All @@ -13,6 +9,13 @@
#define OVERCOMMIT_GUESS 0
#define OVERCOMMIT_ALWAYS 1
#define OVERCOMMIT_NEVER 2

#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/mm.h>

#include <asm/atomic.h>

extern int sysctl_overcommit_memory;
extern int sysctl_overcommit_ratio;
extern atomic_t vm_committed_space;
Expand Down Expand Up @@ -63,5 +66,5 @@ calc_vm_flag_bits(unsigned long flags)
_calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) |
_calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED );
}

#endif /* __KERNEL__ */
#endif /* _LINUX_MMAN_H */

0 comments on commit e5339b9

Please sign in to comment.