ChangeSet 1.1439, 2005/05/04 21:08:16+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
fixmap.h, boot.c, tables.c, io_apic.h:
Cleanup whitespace.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
arch/xen/i386/kernel/acpi/boot.c | 28 +++++++++++++++-------------
drivers/acpi/tables.c | 4 ++--
include/asm-xen/asm-i386/fixmap.h | 2 +-
include/asm-xen/asm-i386/io_apic.h | 31 +++++++++++++++----------------
4 files changed, 33 insertions(+), 32 deletions(-)
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c 2005-05-05
07:03:43 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/acpi/boot.c 2005-05-05
07:03:43 -04:00
@@ -109,17 +109,18 @@
char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
{
- unsigned int i,j;
+ unsigned int i,j;
- j = PAGE_ALIGN(size) >> PAGE_SHIFT;
- for (i = 0; (i < FIX_ACPI_PAGES) && j ; i++, j--) {
- __set_fixmap_ma(FIX_ACPI_END - i,
- (phys_addr & PAGE_MASK) + (i << PAGE_SHIFT),
- PAGE_KERNEL);
- }
+ j = PAGE_ALIGN(size) >> PAGE_SHIFT;
+ for (i = 0; (i < FIX_ACPI_PAGES) && j ; i++, j--) {
+ __set_fixmap_ma(FIX_ACPI_END - i,
+ (phys_addr & PAGE_MASK) + (i << PAGE_SHIFT),
+ PAGE_KERNEL);
+ }
- return (char *) __fix_to_virt(FIX_ACPI_END) + (phys_addr & ~PAGE_MASK);
+ return (char *) __fix_to_virt(FIX_ACPI_END) + (phys_addr & ~PAGE_MASK);
}
+
#else
#ifdef CONFIG_X86_64
@@ -523,7 +524,7 @@
{
unsigned long offset = 0;
unsigned long sig_len = sizeof("RSD PTR ") - 1;
- unsigned long vstart = isa_bus_to_virt(start);
+ unsigned long vstart = isa_bus_to_virt(start);
/*
* Scan all 16-byte boundaries of the physical memory region for the
@@ -649,7 +650,6 @@
else if (efi.acpi)
return __pa(efi.acpi);
}
-
/*
* Scan memory looking for the RSDP signature. First search EBDA (low
* memory) paragraphs and then search upper memory (E0000-FFFFF).
@@ -658,7 +658,7 @@
if (!rsdp_phys)
rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);
- __set_fixmap_ma(FIX_ACPI_RSDP_PAGE, rsdp_phys, PAGE_KERNEL);
+ __set_fixmap_ma(FIX_ACPI_RSDP_PAGE, rsdp_phys, PAGE_KERNEL);
return rsdp_phys;
}
@@ -674,7 +674,7 @@
int count;
#ifdef CONFIG_XEN
- return 0;
+ return 0;
#endif
/*
@@ -872,7 +872,9 @@
}
#ifdef __i386__
- //check_acpi_pci();
+#ifndef CONFIG_XEN
+ check_acpi_pci();
+#endif
#endif
acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
diff -Nru a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c
b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c
--- a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c 2005-05-05 07:03:43
-04:00
+++ b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c 2005-05-05 07:03:43
-04:00
@@ -581,8 +581,8 @@
return -ENODEV;
}
- rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE)
- + (rsdp_phys & ~PAGE_MASK));
+ rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) +
+ (rsdp_phys & ~PAGE_MASK));
if (!rsdp) {
printk(KERN_WARNING PREFIX "Unable to map RSDP\n");
return -ENODEV;
diff -Nru a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h 2005-05-05
07:03:43 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/fixmap.h 2005-05-05
07:03:43 -04:00
@@ -80,7 +80,7 @@
#ifdef CONFIG_ACPI_BOOT
FIX_ACPI_BEGIN,
FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
- FIX_ACPI_RSDP_PAGE,
+ FIX_ACPI_RSDP_PAGE,
#endif
#ifdef CONFIG_PCI_MMCONFIG
FIX_PCIE_MCFG,
diff -Nru a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io_apic.h
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io_apic.h
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io_apic.h
2005-05-05 07:03:43 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/io_apic.h
2005-05-05 07:03:43 -04:00
@@ -165,28 +165,27 @@
static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)
{
- physdev_op_t op;
- int ret;
+ physdev_op_t op;
+ int ret;
- op.cmd = PHYSDEVOP_APIC_READ;
- op.u.apic_op.apic = apic;
- op.u.apic_op.offset = reg;
- ret = HYPERVISOR_physdev_op(&op);
- if (ret)
- return ret;
- return op.u.apic_op.value;
+ op.cmd = PHYSDEVOP_APIC_READ;
+ op.u.apic_op.apic = apic;
+ op.u.apic_op.offset = reg;
+ ret = HYPERVISOR_physdev_op(&op);
+ if (ret)
+ return ret;
+ return op.u.apic_op.value;
}
static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned
int value)
{
- physdev_op_t op;
- int ret;
+ physdev_op_t op;
- op.cmd = PHYSDEVOP_APIC_WRITE;
- op.u.apic_op.apic = apic;
- op.u.apic_op.offset = reg;
- op.u.apic_op.value = value;
- ret = HYPERVISOR_physdev_op(&op);
+ op.cmd = PHYSDEVOP_APIC_WRITE;
+ op.u.apic_op.apic = apic;
+ op.u.apic_op.offset = reg;
+ op.u.apic_op.value = value;
+ HYPERVISOR_physdev_op(&op);
}
/*
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home