diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 22:38:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 22:38:45 +0200 |
| commit | 38cb162b7585d837083b8365da1eb32687c5164c (patch) | |
| tree | e4ae15715b23b320b1a92699fac767bc766c8f0b /arch/ia64/mm | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| parent | [IA64] wire up pselect, ppoll (diff) | |
| download | linux-38cb162b7585d837083b8365da1eb32687c5164c.tar.xz linux-38cb162b7585d837083b8365da1eb32687c5164c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] wire up pselect, ppoll
[IA64] Add TIF_RESTORE_SIGMASK
[IA64] unwind did not work for processes born with CLONE_STOPPED
[IA64] Optional method to purge the TLB on SN systems
[IA64] SPIN_LOCK_UNLOCKED macro cleanup in arch/ia64
[IA64-SN2][KJ] mmtimer.c-kzalloc
[IA64] fix stack alignment for ia32 signal handlers
[IA64] - Altix: hotplug after intr redirect can crash system
[IA64] save and restore cpus_allowed in cpu_idle_wait
[IA64] Removal of percpu TR cleanup in kexec code
[IA64] Fix some section mismatch errors
Diffstat (limited to 'arch/ia64/mm')
| -rw-r--r-- | arch/ia64/mm/tlb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index ffad7624436c..fa4e6d4810f3 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c @@ -32,9 +32,9 @@ static struct { } purge; struct ia64_ctx ia64_ctx = { - .lock = SPIN_LOCK_UNLOCKED, - .next = 1, - .max_ctx = ~0U + .lock = __SPIN_LOCK_UNLOCKED(ia64_ctx.lock), + .next = 1, + .max_ctx = ~0U }; DEFINE_PER_CPU(u8, ia64_need_tlb_flush); |