projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
arch
/
ia64
/
kernel
/
efi.c
diff --git
a/arch/ia64/kernel/efi.c
b/arch/ia64/kernel/efi.c
index
b13c055
..
bb8770a
100644
(file)
--- a/
arch/ia64/kernel/efi.c
+++ b/
arch/ia64/kernel/efi.c
@@
-632,7
+632,7
@@
kern_memory_descriptor (unsigned long phys_addr)
if (phys_addr - md->start < (md->num_pages << EFI_PAGE_SHIFT))
return md;
}
if (phys_addr - md->start < (md->num_pages << EFI_PAGE_SHIFT))
return md;
}
- return
0
;
+ return
NULL
;
}
static efi_memory_desc_t *
}
static efi_memory_desc_t *
@@
-652,7
+652,7
@@
efi_memory_descriptor (unsigned long phys_addr)
if (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT))
return md;
}
if (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT))
return md;
}
- return
0
;
+ return
NULL
;
}
u32
}
u32
@@
-759,7
+759,7
@@
valid_phys_addr_range (unsigned long phys_addr, unsigned long size)
}
int
}
int
-valid_mmap_phys_addr_range (unsigned long p
hys_addr
, unsigned long size)
+valid_mmap_phys_addr_range (unsigned long p
fn
, unsigned long size)
{
/*
* MMIO regions are often missing from the EFI memory map.
{
/*
* MMIO regions are often missing from the EFI memory map.
@@
-923,7
+923,7
@@
find_memmap_space (void)
void
efi_memmap_init(unsigned long *s, unsigned long *e)
{
void
efi_memmap_init(unsigned long *s, unsigned long *e)
{
- struct kern_memdesc *k, *prev =
0
;
+ struct kern_memdesc *k, *prev =
NULL
;
u64 contig_low=0, contig_high=0;
u64 as, ae, lim;
void *efi_map_start, *efi_map_end, *p, *q;
u64 contig_low=0, contig_high=0;
u64 as, ae, lim;
void *efi_map_start, *efi_map_end, *p, *q;