From: Glauber Costa <gcosta@redhat.com>
To: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
tglx@linutronix.de, mingo@elte.hu, ak@suse.de
Subject: Re: [PATCH 58/79] [PATCH] include mach_apic.h in smpboot_64.c and smpboot.c
Date: Thu, 20 Mar 2008 11:25:20 -0300 [thread overview]
Message-ID: <47E273D0.40402@redhat.com> (raw)
In-Reply-To: <86802c440803192356l6ff7e8dg9cfbfd3bc045dcac@mail.gmail.com>
Yinghai Lu wrote:
> On Wed, Mar 19, 2008 at 10:25 AM, Glauber de Oliveira Costa
> <gcosta@redhat.com> wrote:
>> From: Glauber Costa <gcosta@redhat.com>
>>
>> After the inclusion, a lot of files needs fixing for conflicts,
>> some of them in the headers themselves, to accomodate for both
>> i386 and x86_64 versions.
>>
>> Signed-off-by: Glauber Costa <gcosta@redhat.com>
>> ---
>> arch/x86/kernel/acpi/boot.c | 2 ++
>> arch/x86/kernel/mpparse_64.c | 2 ++
>> arch/x86/kernel/smpboot.c | 2 ++
>> arch/x86/kernel/smpboot_64.c | 1 +
>> arch/x86/vdso/Makefile | 2 +-
>> include/asm-x86/apic.h | 1 -
>> include/asm-x86/apicdef.h | 6 ------
>> include/asm-x86/mach-default/mach_apic.h | 11 +++++++++++
>> include/asm-x86/mach-default/mach_apicdef.h | 5 +++++
>> include/asm-x86/smp_64.h | 9 +--------
>> 10 files changed, 25 insertions(+), 16 deletions(-)
>
> please don't.
>
> before this patch
> include/asm-x86/mach_apic.h is only for x86_64 only
> include/asm-x86/mach-default/mach_apic.h is for i386 only.
>
> and both have __ASM_MACH_APIC_H defined.
>
> may need another name?
>
> YH
Another name is possible, but I'd prefer to get rid of the
asm-x86/mach_apic.h. The goal here is to have things integrated, so
unless really necessary, this is prefered.
Is this related to your problem anyhow? (just in curiosity)
next prev parent reply other threads:[~2008-03-20 14:29 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-19 17:24 [PATCH 0/79] smpboot integration Glauber de Oliveira Costa
2008-03-19 17:24 ` [PATCH 01/79] [PATCH] change var types in __inquire_remote_apic Glauber de Oliveira Costa
2008-03-19 17:24 ` [PATCH 02/79] [PATCH] add loglevel to printks Glauber de Oliveira Costa
2008-03-19 17:24 ` [PATCH 03/79] [PATCH] use apic_*_around instead of apic_write in x86_64 Glauber de Oliveira Costa
2008-03-19 17:24 ` [PATCH 04/79] [PATCH] use start_ipi_hook " Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 05/79] [PATCH] add an smp_apply_quirks to smpboot_32.c Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 06/79] [PATCH] decouple call to print_cpu_info from smp_store_cpu_info Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 07/79] [PATCH] provide specialized identification routines for x86_64 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 08/79] [PATCH] use identify_boot_cpu Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 09/79] [PATCH] call identify_secondary_cpu in smp_store_cpu_info Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 10/79] [PATCH] merge smp_store_cpu_info Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 11/79] [PATCH] always enable irqs when entering idle Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 12/79] [PATCH] don't call local_irq_enable before " Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 13/79] [PATCH] move setup_secondary_clock a little bit down in the function Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 14/79] [PATCH] move state update out of ipi_lock Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 15/79] [PATCH] provide APIC_INTEGRATED definition for x86_64 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 16/79] [PATCH] use APIC_INTEGRATED tests in x86_64 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 17/79] [PATCH] add barriers statement Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 18/79] [PATCH] isolate sanity checking Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 19/79] [PATCH] isolate logic to disable smp Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 20/79] [PATCH] do tests before do_boot_cpu in i386 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 21/79] [PATCH] make __smp_prepare_cpu void Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 22/79] [PATCH] move assignment of CPU_PREPARE before do_boot_cpu Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 23/79] [PATCH] unify extern masks declaration Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 24/79] [PATCH] define bios to apicid mapping Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 25/79] [PATCH] initialize map pointers in setup_32.c Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 26/79] [PATCH] make node to apic mapping declarations unconditional Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 27/79] [PATCH] fix alloc_bootmem_pages_node macro Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 28/79] [PATCH] use specialized routine for setup per-cpu area Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 29/79] [PATCH] fill bios cpu to apicid maps Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 30/79] [PATCH] fill cpu to apicid and present map in mpparse Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 31/79] [PATCH] get rid of cpucount Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 32/79] [PATCH] allow user to impress friends Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 33/79] [PATCH] do smp tainting checks in a separate function Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 34/79] [PATCH] move impress_friends and smp_check to cpus_done Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 35/79] [PATCH] add subarch support (for headers) to x86_64 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 36/79] [PATCH] include mach_wakecpu.h in smpboot_64 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 37/79] [PATCH] include smpboot_hooks.h in smpboot_64.c Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 38/79] [PATCH] move smp_intr_init away from smpboot_32.c Glauber de Oliveira Costa
[not found] ` <12059477521176-git-send! -email-gcosta@redhat.com>
2008-03-19 17:25 ` [PATCH 39/79] [PATCH] don't set maps in native_smp_prepare_boot_cpu() Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 40/79] [PATCH] wipe get_nmi_reason out of nmi_64.h Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 41/79] [PATCH] unify nmi_32.h and nmi_64.h Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 42/79] [PATCH] call check_nmi_watchdog explicitly in native_smp_cpus_done Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 43/79] [PATCH] call nmi_watchdog_default in i386 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 44/79] [PATCH] don't initialize sibling and core maps during preparation Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 45/79] [PATCH] fix apic acking of irqs Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 46/79] [PATCH] schedule work only if keventd is already running Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 47/79] [PATCH] do not zap_low_mappings in __smp_prepare_cpus Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 48/79] [PATCH] boot cpus from cpu_up, instead of prepare_cpus Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 49/79] [PATCH] get rid of commenced mask Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 50/79] [PATCH] use create_idle struct in do_boot_cpu Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 51/79] [PATCH] don't span a new worker in __smp_prepare_cpu Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 52/79] [PATCH] modify smp_callin in x86_64 to look like i386 Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 53/79] [PATCH] wrap esr setting up in i386 in lapic_setup_esr Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 54/79] [PATCH] provide an end_local_APIC_setup function Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 55/79] [PATCH] calibrate delay with irqs enabled Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 56/79] [PATCH] minor adjustments for do_boot_cpu Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 57/79] [PATCH] call do_boot_cpu directly from native_cpu_up Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 58/79] [PATCH] include mach_apic.h in smpboot_64.c and smpboot.c Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 59/79] [PATCH] change wakeup_secondary name Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 60/79] [PATCH] add callin tests to cpu_up Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 61/79] [PATCH] move {un}map_cpu_to_logical_apicid to smpboot.c Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 62/79] [PATCH] move stack_start to smp.h Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 63/79] [PATCH] change boot_cpu_id to boot_cpu_physical_apicid Glauber de Oliveira Costa
2008-03-19 17:25 ` [PATCH 64/79] [PATCH] integrate do_boot_cpu Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 65/79] [PATCH] integrate start_secondary Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 66/79] [PATCH] merge smp_prepare_boot_cpu Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 67/79] [PATCH] merge native_smp_cpus_done Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 68/79] [PATCH] use physical id when disabling smp Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 69/79] [PATCH] get rid of smp_boot_cpus Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 70/79] [PATCH] additions to i386 native_smp_prepare_cpus Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 71/79] [PATCH] assign nr_ioapics = 0 in smpboot_hooks.h Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 72/79] [PATCH] change x86_64 native_smp_prepare_cpus to match i386 Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 73/79] [PATCH] add extra sanity check Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 74/79] [PATCH] change x86_64 sanity checks to match i386 Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 75/79] [PATCH] introduce smpboot_clear_io_apic Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 76/79] [PATCH] merge native_smp_prepare_cpus Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 77/79] [PATCH] merge cpu_exit_clear Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 78/79] [PATCH] move apicid mappings to smpboot.c Glauber de Oliveira Costa
2008-03-19 17:26 ` [PATCH 79/79] [PATCH] remove smpboot_32.c and smpboot_64.c Glauber de Oliveira Costa
2008-03-20 6:56 ` [PATCH 58/79] [PATCH] include mach_apic.h in smpboot_64.c and smpboot.c Yinghai Lu
2008-03-20 14:25 ` Glauber Costa [this message]
2008-03-20 18:00 ` Yinghai Lu
2008-03-21 22:37 ` Yinghai Lu
2008-03-20 10:28 ` [PATCH 45/79] [PATCH] fix apic acking of irqs Maciej W. Rozycki
2008-03-20 15:04 ` Glauber Costa
2008-03-20 22:27 ` Maciej W. Rozycki
2008-03-24 14:51 ` Glauber Costa
2008-03-24 23:19 ` Maciej W. Rozycki
2008-03-25 12:40 ` Andi Kleen
2008-03-25 13:42 ` Glauber Costa
2008-03-25 15:48 ` Maciej W. Rozycki
2008-03-25 22:39 ` Glauber Costa
2008-03-19 17:35 ` [PATCH 0/79] smpboot integration Ingo Molnar
2008-03-20 2:18 ` Yinghai Lu
2008-03-20 3:00 ` Yinghai Lu
2008-03-20 3:32 ` Yinghai Lu
2008-03-20 4:40 ` Glauber Costa
2008-03-20 4:59 ` Yinghai Lu
[not found] ` <20080321133327.GN27245@elte.hu>
[not found] ` <86802c440803211218t5850ba52w78f8cb9849097ee0@mail.gmail.com>
[not found] ` <20080321195506.GB16179@elte.hu>
[not found] ` <86802c440803211303m50506ae5ta4c095e40fa1e40d@mail.gmail.com>
[not found] ` <86802c440803211441v30840be4y76d63da567c9af40@mail.gmail.com>
2008-03-21 22:14 ` Yinghai Lu
2008-03-21 22:18 ` Ingo Molnar
2008-03-24 15:13 ` Glauber Costa
2008-03-19 18:48 ` Ingo Molnar
2008-03-19 19:36 ` Ingo Molnar
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=47E273D0.40402@redhat.com \
--to=gcosta@redhat.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=yhlu.kernel@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).