lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/apic' into irq/numa

Browse Source 
Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-05-12 12:17:30 +02:00
parent b9c61b7007 cec6be6d10
commit 6cda3eb62e
573 changed files with 16239 additions and 15593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/head_32.S
View File

@ -735,7 +735,7 @@ go_to_highmem:
nop
/* The code above should be at beginning and we have to take care about
* short jumps, as branching to .text.init section from .text is usually
* short jumps, as branching to .init.text section from .text is usually
* impossible */
__INIT
/* Acquire boot time privileged register values, this will help debugging.

2
arch/sparc/kernel/head_64.S
View File

@ -467,7 +467,7 @@ jump_to_sun4u_init:
jmpl %g2 + %g0, %g0
nop
.section .text.init.refok
__REF
sun4u_init:
BRANCH_IF_SUN4V(g1, sun4v_init)