diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 18:30:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 18:30:37 -0800 |
| commit | 2b1caf6ed7b888c95a1909d343799672731651a5 (patch) | |
| tree | 7ab9a7ae13bc02376bce6267df67f6f2aa9091f1 /arch/x86 | |
| parent | d551d81d6a720542873f478def60baab6b5df403 (diff) | |
| parent | bd924e8cbd4b73ffb7d707a774c04f7e2cae88ed (diff) | |
| download | op-kernel-dev-2b1caf6ed7b888c95a1909d343799672731651a5.zip op-kernel-dev-2b1caf6ed7b888c95a1909d343799672731651a5.tar.gz | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
smp: Allow on_each_cpu() to be called while early_boot_irqs_disabled status to init/main.c
lockdep: Move early boot local IRQ enable/disable status to init/main.c
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 7e8d3bc..50542ef 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1194,7 +1194,7 @@ asmlinkage void __init xen_start_kernel(void) per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; local_irq_disable(); - early_boot_irqs_off(); + early_boot_irqs_disabled = true; memblock_init(); |
