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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
acpi
/
boot.c
diff --git
a/arch/i386/kernel/acpi/boot.c
b/arch/i386/kernel/acpi/boot.c
index
a85d8f7
..
7311327
100644
(file)
--- a/
arch/i386/kernel/acpi/boot.c
+++ b/
arch/i386/kernel/acpi/boot.c
@@
-141,7
+141,7
@@
char *__acpi_map_table(unsigned long phys, unsigned long size)
idx = FIX_ACPI_END;
while (mapped_size < size) {
if (--idx < FIX_ACPI_BEGIN)
idx = FIX_ACPI_END;
while (mapped_size < size) {
if (--idx < FIX_ACPI_BEGIN)
- return
NULL;
/* cannot handle this */
+ return
0;
/* cannot handle this */
phys += PAGE_SIZE;
set_fixmap(idx, phys);
mapped_size += PAGE_SIZE;
phys += PAGE_SIZE;
set_fixmap(idx, phys);
mapped_size += PAGE_SIZE;
@@
-560,7
+560,7
@@
extern u32 pmtmr_ioport;
static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
{
static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
{
- struct fadt_descriptor_rev2 *fadt =
NULL
;
+ struct fadt_descriptor_rev2 *fadt =
0
;
fadt = (struct fadt_descriptor_rev2*) __acpi_map_table(phys,size);
if(!fadt) {
fadt = (struct fadt_descriptor_rev2*) __acpi_map_table(phys,size);
if(!fadt) {