Merge branch 'x86/apic' into x86/platform

Browse source

Reason: Devicetree based ioapic setup depends on the apic changes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

...

This commit is contained in:

Thomas Gleixner 2011-02-23 20:00:55 +01:00

parent 939d578ecc abb0052289

commit cb4cfd568c

6 changed files with 163 additions and 176 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/Kconfig

View file

12

arch/x86/include/asm/apicdef.h

View file

44

arch/x86/include/asm/io_apic.h

View file

5

arch/x86/kernel/apic/apic.c

View file

265

arch/x86/kernel/apic/io_apic.c

View file

11

arch/x86/kernel/smpboot.c

View file