projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull novell-bugzilla-156426 into release branch
[powerpc.git]
/
arch
/
i386
/
kernel
/
acpi
/
boot.c
diff --git
a/arch/i386/kernel/acpi/boot.c
b/arch/i386/kernel/acpi/boot.c
index
40e5aba
..
5ccbf58
100644
(file)
--- a/
arch/i386/kernel/acpi/boot.c
+++ b/
arch/i386/kernel/acpi/boot.c
@@
-215,7
+215,7
@@
static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
{
struct acpi_table_madt *madt = NULL;
{
struct acpi_table_madt *madt = NULL;
- if (!phys_addr || !size)
+ if (!phys_addr || !size
|| !cpu_has_apic
)
return -EINVAL;
madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
return -EINVAL;
madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@
-621,9
+621,9
@@
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 *fadt = NULL;
- fadt = (struct fadt_descriptor
_rev2
*)__acpi_map_table(phys, size);
+ fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);
if (!fadt) {
printk(KERN_WARNING PREFIX "Unable to map FADT\n");
return 0;
if (!fadt) {
printk(KERN_WARNING PREFIX "Unable to map FADT\n");
return 0;
@@
-754,7
+754,7
@@
static int __init acpi_parse_madt_ioapic_entries(void)
return -ENODEV;
}
return -ENODEV;
}
- if (!cpu_has_apic)
+ if (!cpu_has_apic)
return -ENODEV;
/*
return -ENODEV;
/*