projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' into upstream
[powerpc.git]
/
arch
/
sparc
/
kernel
/
sys_sunos.c
diff --git
a/arch/sparc/kernel/sys_sunos.c
b/arch/sparc/kernel/sys_sunos.c
index
d07ae02
..
aa0fb2e
100644
(file)
--- a/
arch/sparc/kernel/sys_sunos.c
+++ b/
arch/sparc/kernel/sys_sunos.c
@@
-30,6
+30,7
@@
#include <linux/stat.h>
#include <linux/slab.h>
#include <linux/pagemap.h>
#include <linux/stat.h>
#include <linux/slab.h>
#include <linux/pagemap.h>
+#include <linux/capability.h>
#include <linux/errno.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/errno.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@
-195,7
+196,7
@@
asmlinkage int sunos_brk(unsigned long brk)
* simple, it hopefully works in most obvious cases.. Easy to
* fool it, but this should catch most mistakes.
*/
* simple, it hopefully works in most obvious cases.. Easy to
* fool it, but this should catch most mistakes.
*/
- freepages = g
et_page_cache_size(
);
+ freepages = g
lobal_page_state(NR_FILE_PAGES
);
freepages >>= 1;
freepages += nr_free_pages();
freepages += nr_swap_pages;
freepages >>= 1;
freepages += nr_free_pages();
freepages += nr_swap_pages;