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]
/
arch
/
i386
/
kernel
/
acpi
/
boot-xen.c
diff --git
a/arch/i386/kernel/acpi/boot-xen.c
b/arch/i386/kernel/acpi/boot-xen.c
index
6bd4b79
..
13be515
100644
(file)
--- a/
arch/i386/kernel/acpi/boot-xen.c
+++ b/
arch/i386/kernel/acpi/boot-xen.c
@@
-24,7
+24,6
@@
*/
#include <linux/init.h>
*/
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/acpi.h>
#include <linux/efi.h>
#include <linux/module.h>
#include <linux/acpi.h>
#include <linux/efi.h>
#include <linux/module.h>
@@
-60,7
+59,7
@@
static inline int gsi_irq_sharing(int gsi) { return gsi; }
#define BAD_MADT_ENTRY(entry, end) ( \
(!entry) || (unsigned long)entry + sizeof(*entry) > end || \
#define BAD_MADT_ENTRY(entry, end) ( \
(!entry) || (unsigned long)entry + sizeof(*entry) > end || \
- ((acpi_table_entry_header *)entry)->length
!=
sizeof(*entry))
+ ((acpi_table_entry_header *)entry)->length
<
sizeof(*entry))
#define PREFIX "ACPI: "
#define PREFIX "ACPI: "
@@
-204,6
+203,8
@@
int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
if (mcfg->config[i].base_reserved) {
printk(KERN_ERR PREFIX
"MMCONFIG not in low 4GB of memory\n");
if (mcfg->config[i].base_reserved) {
printk(KERN_ERR PREFIX
"MMCONFIG not in low 4GB of memory\n");
+ kfree(pci_mmcfg_config);
+ pci_mmcfg_config_num = 0;
return -ENODEV;
}
}
return -ENODEV;
}
}
@@
-217,7
+218,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);
@@
-233,9
+234,8
@@
static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
madt->lapic_address);
}
madt->lapic_address);
}
-#ifndef CONFIG_X86_64
acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
-#endif
+
return 0;
}
return 0;
}
@@
-625,9
+625,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;
@@
-758,7
+758,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;
/*