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@xxxxxxxxxxxxxxxx
> 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)
> [...]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
