git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-s390
/
pgalloc.h
diff --git
a/include/asm-s390/pgalloc.h
b/include/asm-s390/pgalloc.h
index
0259469
..
808c15e
100644
(file)
--- a/
include/asm-s390/pgalloc.h
+++ b/
include/asm-s390/pgalloc.h
@@
-13,7
+13,6
@@
#ifndef _S390_PGALLOC_H
#define _S390_PGALLOC_H
#ifndef _S390_PGALLOC_H
#define _S390_PGALLOC_H
-#include <linux/config.h>
#include <linux/threads.h>
#include <linux/gfp.h>
#include <linux/mm.h>
#include <linux/threads.h>
#include <linux/gfp.h>
#include <linux/mm.h>
@@
-147,7
+146,7
@@
pte_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
pte_t *pte = pte_alloc_one_kernel(mm, vmaddr);
if (pte)
return virt_to_page(pte);
pte_t *pte = pte_alloc_one_kernel(mm, vmaddr);
if (pte)
return virt_to_page(pte);
- return
0
;
+ return
NULL
;
}
static inline void pte_free_kernel(pte_t *pte)
}
static inline void pte_free_kernel(pte_t *pte)