git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
pgtable_64.c
diff --git
a/arch/powerpc/mm/pgtable_64.c
b/arch/powerpc/mm/pgtable_64.c
index
2ffca63
..
b1da031
100644
(file)
--- a/
arch/powerpc/mm/pgtable_64.c
+++ b/
arch/powerpc/mm/pgtable_64.c
@@
-22,7
+22,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-174,7
+173,7
@@
void __iomem * __ioremap(unsigned long addr, unsigned long size,
pa = addr & PAGE_MASK;
size = PAGE_ALIGN(addr + size) - pa;
pa = addr & PAGE_MASK;
size = PAGE_ALIGN(addr + size) - pa;
- if (
size == 0
)
+ if (
(size == 0) || (pa == 0)
)
return NULL;
if (mem_init_done) {
return NULL;
if (mem_init_done) {