Merge branch 'x86/cleanups' into x86/apic

Browse source

Merge in the cleanups because a followup x86/apic change relies on them.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2012-06-15 14:16:54 +02:00

parent 5a0a2a3081 fbd24153c4

commit 879060d574

6 changed files with 12 additions and 17 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/include/asm/x86_init.h

View file

9

arch/x86/kernel/apic/io_apic.c

View file

12

arch/x86/kernel/early_printk.c

View file

2

arch/x86/kernel/setup.c

View file

2

arch/x86/kernel/x86_init.c

View file

2

arch/x86/platform/uv/uv_irq.c

View file