From: tip-bot for Jiang Liu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rdunlap@infradead.org, gregkh@linuxfoundation.org,
jiang.liu@linux.intel.com, yinghai@kernel.org,
linux-kernel@vger.kernel.org, rjw@rjwysocki.net,
tony.luck@intel.com, lenb@kernel.org, bp@alien8.de,
bhelgaas@google.com, benh@kernel.crashing.org, mingo@kernel.org,
tglx@linutronix.de, hpa@zytor.com, joro@8bytes.org,
konrad.wilk@oracle.com
Subject: [tip:x86/apic] ACPI: Fix minor syntax issues in processor_core.c
Date: Mon, 3 Nov 2014 02:58:05 -0800 [thread overview]
Message-ID: <tip-5922b6f497ed2daf5c06654c3dbda7ca911bcfef@git.kernel.org> (raw)
In-Reply-To: <1414387308-27148-7-git-send-email-jiang.liu@linux.intel.com>
Commit-ID: 5922b6f497ed2daf5c06654c3dbda7ca911bcfef
Gitweb: http://git.kernel.org/tip/5922b6f497ed2daf5c06654c3dbda7ca911bcfef
Author: Jiang Liu <jiang.liu@linux.intel.com>
AuthorDate: Mon, 27 Oct 2014 13:21:36 +0800
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 3 Nov 2014 11:56:07 +0100
ACPI: Fix minor syntax issues in processor_core.c
Fix minor syntax issues in processor_core.c to follow coding styles.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Len Brown <lenb@kernel.org>
Link: http://lkml.kernel.org/r/1414387308-27148-7-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/acpi/processor_core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index ef58f46..342942f 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -125,13 +125,12 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
}
header = (struct acpi_subtable_header *)obj->buffer.pointer;
- if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
+ if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)
map_lapic_id(header, acpi_id, &apic_id);
- } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
+ else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)
map_lsapic_id(header, type, acpi_id, &apic_id);
- } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
+ else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)
map_x2apic_id(header, type, acpi_id, &apic_id);
- }
exit:
kfree(buffer.pointer);
@@ -164,7 +163,7 @@ int acpi_map_cpuid(int apic_id, u32 acpi_id)
* For example,
*
* Scope (_PR)
- * {
+ * {
* Processor (CPU0, 0x00, 0x00000410, 0x06) {}
* Processor (CPU1, 0x01, 0x00000410, 0x06) {}
* Processor (CPU2, 0x02, 0x00000410, 0x06) {}
next prev parent reply other threads:[~2014-11-03 11:00 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 5:21 [Patch v7 00/18] Enable support of IOAPIC hotplug on x86 platforms Jiang Liu
2014-10-27 5:21 ` [Patch v7 01/18] ACPI, irq: fix regression casued by 6b9fb7082409 Jiang Liu
2014-10-28 17:44 ` Pavel Machek
2014-10-28 18:13 ` Bjorn Helgaas
2014-10-28 18:45 ` Thomas Gleixner
2014-10-27 5:21 ` [Patch v7 02/18] x86, intel-mid: Create IRQs for APB timers and RTC timers Jiang Liu
2014-10-28 18:54 ` [tip:x86/urgent] " tip-bot for Jiang Liu
2014-10-29 9:10 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 03/18] ACPI, irq, x86: Return IRQ instead of GSI in mp_register_gsi() Jiang Liu
2014-10-28 18:54 ` [tip:x86/urgent] " tip-bot for Jiang Liu
2014-10-29 9:10 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 04/18] x86, PCI, ACPI: Kill private function resource_to_addr() in arch/x86/pci/acpi.c Jiang Liu
2014-11-03 10:57 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-11-03 14:50 ` Borislav Petkov
2014-12-10 4:08 ` Yinghai Lu
2014-12-10 13:36 ` Jiang Liu
2014-12-10 20:15 ` Thomas Gleixner
2014-12-11 0:31 ` Yinghai Lu
2014-12-11 0:35 ` Borislav Petkov
2014-12-11 1:57 ` Yinghai Lu
2014-12-11 4:13 ` Mike Galbraith
2014-12-11 7:42 ` Richard Cochran
2014-12-11 16:36 ` Thomas Gleixner
2014-12-11 16:57 ` Yinghai Lu
2014-12-11 16:37 ` Bjorn Helgaas
2014-10-27 5:21 ` [Patch v7 05/18] ACPI: Correct return value of acpi_dev_resource_address_space() Jiang Liu
2014-10-27 22:30 ` Rafael J. Wysocki
2014-10-27 22:49 ` Bjorn Helgaas
2014-10-27 23:11 ` Rafael J. Wysocki
2014-10-28 1:13 ` Bjorn Helgaas
2014-11-03 10:57 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:00 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 06/18] ACPI: Fix minor syntax issues in processor_core.c Jiang Liu
2014-11-03 10:58 ` tip-bot for Jiang Liu [this message]
2014-12-19 14:02 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 07/18] ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug Jiang Liu
2014-11-03 10:58 ` [tip:x86/apic] " tip-bot for Yinghai Lu
2014-10-27 5:21 ` [Patch v7 08/18] PCI: Remove PCI ioapic driver Jiang Liu
2014-11-03 10:58 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:02 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 09/18] x86, irq: Split out alloc_ioapic_save_registers() Jiang Liu
2014-11-03 10:58 ` [tip:x86/apic] " tip-bot for Yinghai Lu
2014-12-19 14:03 ` tip-bot for Yinghai Lu
2014-10-27 5:21 ` [Patch v7 10/18] x86, irq: Prefer assigned ID in APIC ID register for x86_64 Jiang Liu
2014-11-03 10:59 ` [tip:x86/apic] " tip-bot for Yinghai Lu
2014-12-19 14:03 ` tip-bot for Yinghai Lu
2014-10-27 5:21 ` [Patch v7 11/18] x86, irq: Remove __init marker for functions will be used by IOAPIC hotplug Jiang Liu
2014-11-03 10:59 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:03 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 12/18] x86, irq: Keep balance of IOAPIC pin reference count Jiang Liu
2014-11-03 10:59 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:04 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 13/18] x86, irq: Refine mp_register_ioapic() to prepare for IOAPIC hotplug Jiang Liu
2014-11-03 11:00 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:04 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 14/18] x86, irq, ACPI: Introduce a rwsem to protect IOAPIC operations from hotplug Jiang Liu
2014-11-01 18:59 ` Thomas Gleixner
2014-11-02 5:24 ` Jiang Liu
2014-10-27 5:21 ` [Patch v7 15/18] x86, irq, ACPI: Implement interface to support ACPI based IOAPIC hot-addition Jiang Liu
2014-11-03 11:00 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:04 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 16/18] x86, irq, ACPI: Implement interfaces to support ACPI based IOAPIC hot-removal Jiang Liu
2014-11-03 11:00 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:05 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 17/18] x86, irq: Introduce helper to check whether an IOAPIC has been registered Jiang Liu
2014-10-28 17:47 ` Pavel Machek
2014-11-03 11:01 ` [tip:x86/apic] " tip-bot for Jiang Liu
2014-12-19 14:05 ` tip-bot for Jiang Liu
2014-10-27 5:21 ` [Patch v7 18/18] x86, irq, ACPI: Implement ACPI driver to support IOAPIC hotplug Jiang Liu
2014-11-03 11:01 ` [tip:x86/apic] " tip-bot for Jiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-5922b6f497ed2daf5c06654c3dbda7ca911bcfef@git.kernel.org \
--to=tipbot@zytor.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jiang.liu@linux.intel.com \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rdunlap@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox