diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 10:22:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 10:22:23 +1100 |
| commit | b4a941af83338b09bb4a78fccab434028f04ab44 (patch) | |
| tree | c6769b6ca74dbc0b3569f2c4b322b021405fc960 /arch | |
| parent | 2128c10a668c54bf906139dffdbcf75a5d0ceb8d (diff) | |
| parent | 80b4875e3f55c49a0fd8164623ed1745b16a8b31 (diff) | |
Merge branch 'quilt/rr'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lguest/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 4996cf5f73a0..eba687f0cc0c 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -824,7 +824,7 @@ static void __init lguest_init_IRQ(void) for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) { /* Some systems map "vectors" to interrupts weirdly. Not us! */ - __get_cpu_var(vector_irq)[i] = i - FIRST_EXTERNAL_VECTOR; + __this_cpu_write(vector_irq[i], i - FIRST_EXTERNAL_VECTOR); if (i != SYSCALL_VECTOR) set_intr_gate(i, interrupt[i - FIRST_EXTERNAL_VECTOR]); } |