Pull x86 updates from Ingo Molnar. This touches some non-x86 files due to the sanitized INLINE_SPIN_UNLOCK config usage. Fixed up trivial conflicts due to just header include changes (removing headers due to cpu_idle() merge clashing with the <asm/system.h> split). * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/apic/amd: Be more verbose about LVT offset assignments x86, tls: Off by one limit check x86/ioapic: Add io_apic_ops driver layer to allow interception x86/olpc: Add debugfs interface for EC commands x86: Merge the x86_32 and x86_64 cpu_idle() functions x86/kconfig: Remove CONFIG_TR=y from the defconfigs x86: Stop recursive fault in print_context_stack after stack overflow x86/io_apic: Move and reenable irq only when CONFIG_GENERIC_PENDING_IRQ=y x86/apic: Add separate apic_id_valid() functions for selected apic drivers locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage x86/kconfig: Update defconfigs x86: Fix excessive MSR print out when show_msr is not specified
Showing the changes to kernel (3 of 29 files). Show all
Unified · Split
| @@ -124,8 +124,8 @@ config INLINE_SPIN_LOCK_IRQSAVE · 123 unmodified lines | ||
| 124 | 124 | def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \ |
| 125 | 125 | ARCH_INLINE_SPIN_LOCK_IRQSAVE |
| 126 | 126 | |
| 127 | −config INLINE_SPIN_UNLOCK | |
| 128 | − def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_SPIN_UNLOCK) | |
| 127 | +config UNINLINE_SPIN_UNLOCK | |
| 128 | + bool | |
| 129 | 129 | |
| 130 | 130 | config INLINE_SPIN_UNLOCK_BH |
| 131 | 131 | def_bool !DEBUG_SPINLOCK && ARCH_INLINE_SPIN_UNLOCK_BH |
| @@ -36,6 +36,7 @@ config PREEMPT_VOLUNTARY · 35 unmodified lines | ||
| 36 | 36 | config PREEMPT |
| 37 | 37 | bool "Preemptible Kernel (Low-Latency Desktop)" |
| 38 | 38 | select PREEMPT_COUNT |
| 39 | + select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK | |
| 39 | 40 | help |
| 40 | 41 | This option reduces the latency of the kernel by making |
| 41 | 42 | all kernel code (that is not executing in a critical section) |
| @@ -163,7 +163,7 @@ void __lockfunc _raw_spin_lock_bh(raw_spinlock_t *lock) · 162 unmodified lines | ||
| 163 | 163 | EXPORT_SYMBOL(_raw_spin_lock_bh); |
| 164 | 164 | #endif |
| 165 | 165 | |
| 166 | −#ifndef CONFIG_INLINE_SPIN_UNLOCK | |
| 166 | +#ifdef CONFIG_UNINLINE_SPIN_UNLOCK | |
| 167 | 167 | void __lockfunc _raw_spin_unlock(raw_spinlock_t *lock) |
| 168 | 168 | { |
| 169 | 169 | __raw_spin_unlock(lock); |