lkml.org 
[lkml]   [2012]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/3] x86/apic_ops: Replace apic_ops with x86_apic_ops.
On Fri, Mar 23, 2012 at 01:24:44PM +0100, Ingo Molnar wrote:
>
> * Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote:
>
> > . which makes the code fit within the rest of the x86_ops functions.
> >
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > [v1: Changed x86_apic -> x86_ioapic per Yinghai Lu <yinghai@kernel.org> suggestion]
> > Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
> > ---
> > arch/x86/include/asm/io_apic.h | 40 +++++++++++++++++++++--------
> > arch/x86/include/asm/x86_init.h | 8 ++++++
> > arch/x86/kernel/apic/io_apic.c | 54 ++++----------------------------------
> > arch/x86/kernel/setup.c | 2 +-
> > arch/x86/kernel/x86_init.c | 8 ++++++
> > 5 files changed, 52 insertions(+), 60 deletions(-)
>
> Ok, I guess we can do this.

Ingo,

I am not sure how your prefer these patches, but I think you like git pull, so please
git pull the following branch:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-ingo-3.4

which is based of your "x86-urgent-for-linus" branch and has the following patches:

Jeremy Fitzhardinge (1):
x86: add io_apic_ops to allow interception

Konrad Rzeszutek Wilk (2):
x86/apic_ops: Replace apic_ops with x86_apic_ops.
xen/x86: Implement x86_apic_ops


arch/x86/include/asm/io_apic.h | 31 +++++++++++++++++++++++++++++--
arch/x86/include/asm/x86_init.h | 8 ++++++++
arch/x86/kernel/apic/io_apic.c | 10 ++++++----
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/x86_init.c | 8 ++++++++
arch/x86/xen/Makefile | 2 +-
arch/x86/xen/apic.c | 17 +++++++++++++++++
arch/x86/xen/enlighten.c | 2 ++
arch/x86/xen/xen-ops.h | 4 ++++
9 files changed, 76 insertions(+), 8 deletions(-)

Please pull!


\
 
 \ /
  Last update: 2012-03-27 16:47    [W:0.176 / U:0.604 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site