diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2024-01-25 09:09:08 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-05-03 22:09:27 +0200 |
| commit | 0ec60e28711fc23afd3a64e9a402d08fb83188c3 (patch) | |
| tree | c3f5a4b313931c4fda94dd6d03e2eee68c225a50 /arch/alpha/kernel | |
| parent | 5759b57f03ca07b465dc394112d8f383ef671a82 (diff) | |
| download | linux-stable-0ec60e28711fc23afd3a64e9a402d08fb83188c3.tar.gz linux-stable-0ec60e28711fc23afd3a64e9a402d08fb83188c3.tar.bz2 linux-stable-0ec60e28711fc23afd3a64e9a402d08fb83188c3.zip | |
alpha: sys_sio: fix misspelled ifdefs
definitions of avanti_mv and noname_mv (and associated ALIAS_MV)
are conditional upon the wrong thing - it should be
CONFIG_ALPHA_{AVANTI,NONAME}_CH, not CONFIG_ALPHA_{AVANTI,NONAME}.
The former is a system type; the latter is for the bits shared
by AVANTI with XL and NONAME with ALPHA_BOOK1 resp.
We want all those machine vectors defined (but not aliased - see
ALIAS_MV() definition for details) for GENERIC build; for
system-specfic builds we want only one mv, so avanti_mv should *not*
be there for XL; it certainly should not be have alpha_mv aliased to
it on such config - xl_mv will be there and alpha_mv can't be aliased
to both of those.
The same goes for Noname vs. Alphabook1.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/sys_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index 0bf38f868665..c28a6ae1d989 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c @@ -360,7 +360,7 @@ struct alpha_machine_vector alphabook1_mv __initmv = { ALIAS_MV(alphabook1) #endif -#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_AVANTI) +#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_AVANTI_CH) struct alpha_machine_vector avanti_mv __initmv = { .vector_name = "Avanti", DO_EV4_MMU, @@ -389,7 +389,7 @@ struct alpha_machine_vector avanti_mv __initmv = { ALIAS_MV(avanti) #endif -#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_NONAME) +#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_NONAME_CH) struct alpha_machine_vector noname_mv __initmv = { .vector_name = "Noname", DO_EV4_MMU, |