Merge branch 'x86/apic' into cpus4096

Browse source

This done for conflict prevention: we merge it into the cpus4096 tree
because upcoming cpumask changes will touch apic.c that would collide
with x86/apic otherwise.

...

This commit is contained in:

Ingo Molnar 2008-12-18 11:55:06 +01:00

parent b9974dc6bd a98f8fd24f

commit 9a3d8f735e

2 changed files with 90 additions and 74 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

121

arch/x86/kernel/apic.c

View file

43

arch/x86/kernel/nmi.c

View file