From: Alexander van Heukelum <heukelum@mailshack•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: stephane eranian <eranian@googlemail•com>,
linux-next@vger•kernel.org, Ingo Molnar <mingo@elte•hu>
Subject: Re: linux-next: manual merge of the perfmon3 tree
Date: Tue, 25 Nov 2008 11:39:51 +0100 [thread overview]
Message-ID: <20081125103951.GA18992@mailshack.com> (raw)
In-Reply-To: <20081125210319.35b2d189.sfr@canb.auug.org.au>
On Tue, Nov 25, 2008 at 09:03:19PM +1100, Stephen Rothwell wrote:
> Hi Stephane,
>
> Today's linux-next merge of the perfmon3 tree got a conflict in
> arch/x86/kernel/entry_64.S between commit
> 322648d1ba75280d62f114d47048beb0b35f5047 ("x86: include ENTRY/END in
> entry handlers in entry_64.S") from the x86 tree and commit
> 3511a04973eaac18ee386f0db8c109e589019511 ("perfmon: x86-64 hooks") from
> the perfmon3 tree.
>
> A new way of doing things. I fixed it up (see below) and can carry the
> fixup as necessary. I am not sure about this fix, confirmation would be
> nice.
Yes, this is a good fixup.
Thanks,
Alexander
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc arch/x86/kernel/entry_64.S
> index fc0ad87,b6f061e..0000000
> --- a/arch/x86/kernel/entry_64.S
> +++ b/arch/x86/kernel/entry_64.S
[...removed uninteresting part...]
> +apicinterrupt ERROR_APIC_VECTOR \
> + error_interrupt smp_error_interrupt
> +apicinterrupt SPURIOUS_APIC_VECTOR \
> + spurious_interrupt smp_spurious_interrupt
>
> + #ifdef CONFIG_PERFMON
> -ENTRY(pmu_interrupt)
> - apicinterrupt LOCAL_PERFMON_VECTOR,smp_pmu_interrupt
> -END(pmu_interrupt)
> ++apicinterrupt LOCAL_PERFMON_VECTOR \
> ++ pmu_interrupt smp_pmu_interrupt
> + #endif
> +
> /*
> * Exception entry points.
> - */
> - .macro zeroentry sym
> + */
> +.macro zeroentry sym do_sym
> +ENTRY(\sym)
> [...]
next prev parent reply other threads:[~2008-11-25 11:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 10:03 linux-next: manual merge of the perfmon3 tree Stephen Rothwell
2008-11-25 10:22 ` Ingo Molnar
2008-11-25 14:40 ` stephane eranian
2008-11-25 15:33 ` Ingo Molnar
2008-11-25 16:36 ` stephane eranian
2008-11-25 16:51 ` Ingo Molnar
2008-11-26 3:00 ` Stephen Rothwell
2008-11-26 3:33 ` Ingo Molnar
2008-11-26 7:06 ` Paul Mackerras
2008-11-26 7:16 ` Ingo Molnar
2008-11-26 8:32 ` stephane eranian
2008-11-26 8:46 ` Ingo Molnar
2008-11-26 9:00 ` Andrew Morton
2008-11-26 9:31 ` Peter Zijlstra
2008-11-26 10:21 ` Ingo Molnar
2008-11-25 10:39 ` Alexander van Heukelum [this message]
2008-11-25 15:19 ` stephane eranian
-- strict thread matches above, loose matches on Subject: below --
2008-11-26 4:24 H. Peter Anvin
2008-11-25 10:03 Stephen Rothwell
2008-11-07 8:42 Stephen Rothwell
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=20081125103951.GA18992@mailshack.com \
--to=heukelum@mailshack$(echo .)com \
--cc=eranian@googlemail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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