Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250928
b: refs/heads/master
c: c856507
h: refs/heads/master
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed May 25, 2011
1 parent 8d5c52a commit ff847e0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 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: b09e0fa4b4ea66266058eead43350bd7d55fec67
refs/heads/master: c856507f2b2b47a49d8587afb58930b463f6bff4
8 changes: 0 additions & 8 deletions trunk/include/linux/mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -873,14 +873,6 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
int shmem_zero_setup(struct vm_area_struct *);

#ifndef CONFIG_MMU
extern unsigned long shmem_get_unmapped_area(struct file *file,
unsigned long addr,
unsigned long len,
unsigned long pgoff,
unsigned long flags);
#endif

extern int can_do_mlock(void);
extern int user_shm_lock(size_t, struct user_struct *);
extern void user_shm_unlock(size_t, struct user_struct *);
Expand Down

0 comments on commit ff847e0

Please sign in to comment.