diff options
| author |   Tony Luck <tony.luck@intel.com> | 2019-05-15 18:04:14 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-15 18:43:46 -0700 |
| commit | 8a635ffb142125c6637fe71d5cbce25e7dfa275e (patch) | |
| tree | 003d1b7af85af54a665b439ffa596e133b12c360 /arch/ia64/kernel/machvec.c | |
| parent | Merge tag 'nfsd-5.2' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-dev-8a635ffb142125c6637fe71d5cbce25e7dfa275e.tar.xz linux-dev-8a635ffb142125c6637fe71d5cbce25e7dfa275e.zip | |
ia64: Make sure that we have a mmiowb function real early
Generic kernels feed many operation through the "machvec" logic to get
the correct form of the operation for the current system. "mmiowb()" is
one of those operations.
Although machvec is initialized very early in boot, it isn't early
enough for a recent upstream kernel change that added mmiowb to the
spin_unlock() path.
Statically initialize the mmiowb field of machvec so that we won't die
with a call through a NULL pointer. This should be safe because we do
the real initialization of machvec before bringing up any addtional CPUs
or doing any I/O.
Fixes: 49ca6462fc9e ("ia64/mmiowb: Add unconditional mmiowb() to arch_spin_unlock()")
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/ia64/kernel/machvec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c index 1b604d02250b..ebd82535f51b 100644 --- a/arch/ia64/kernel/machvec.c +++ b/arch/ia64/kernel/machvec.c @@ -10,7 +10,9 @@ #include <asm/page.h> -struct ia64_machine_vector ia64_mv; +struct ia64_machine_vector ia64_mv = { + .mmiowb = ___ia64_mmiowb +}; EXPORT_SYMBOL(ia64_mv); static struct ia64_machine_vector * __init |