Skip to content

Commit

Permalink
x86: remove the Voyager 32-bit subarch
Browse files Browse the repository at this point in the history
Impact: remove unused/broken code

The Voyager subarch last built successfully on the v2.6.26 kernel
and has been stale since then and does not build on the v2.6.27,
v2.6.28 and v2.6.29-rc5 kernels.

No actual users beyond the maintainer reported this breakage.
Patches were sent and most of the fixes were accepted but the
discussion around how to do a few remaining issues cleanly
fizzled out with no resolution and the code remained broken.

In the v2.6.30 x86 tree development cycle 32-bit subarch support
has been reworked and removed - and the Voyager code, beyond the
build problems already known, needs serious and significant
changes and probably a rewrite to support it.

CONFIG_X86_VOYAGER has been marked BROKEN then. The maintainer has
been notified but no patches have been sent so far to fix it.

While all other subarchs have been converted to the new scheme,
voyager is still broken. We'd prefer to receive patches which
clean up the current situation in a constructive way, but even in
case of removal there is no obstacle to add that support back
after the issues have been sorted out in a mutually acceptable
fashion.

So remove this inactive code for now.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Feb 22, 2009
1 parent 8425091 commit 965c7ec
Show file tree
Hide file tree
Showing 22 changed files with 2 additions and 4,335 deletions.
14 changes: 0 additions & 14 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ config X86_EXTENDED_PLATFORM
SGI 320/540 (Visual Workstation)
Summit/EXA (IBM x440)
Unisys ES7000 IA32 series
Voyager (NCR)

If you have one of these systems, or if you want to build a
generic distribution kernel, say Y here - otherwise say N.
Expand Down Expand Up @@ -423,19 +422,6 @@ config X86_ES7000
Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
supposed to run on an IA32-based Unisys ES7000 system.

config X86_VOYAGER
bool "Voyager (NCR)"
depends on SMP && !PCI && BROKEN
depends on X86_32_NON_STANDARD
---help---
Voyager is an MCA-based 32-way capable SMP architecture proprietary
to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.

*** WARNING ***

If you do not specifically know you have a Voyager based machine,
say N here, otherwise the kernel you build will not be bootable.

config SCHED_OMIT_FRAME_POINTER
def_bool y
prompt "Single-depth WCHAN output"
Expand Down
1 change: 0 additions & 1 deletion arch/x86/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o
setup-y += header.o main.o mca.o memory.o pm.o pmjump.o
setup-y += printf.o string.o tty.o video.o video-mode.o version.o
setup-$(CONFIG_X86_APM_BOOT) += apm.o
setup-$(CONFIG_X86_VOYAGER) += voyager.o

# The link order of the video-*.o modules can matter. In particular,
# video-vga.o *must* be listed first, followed by video-vesa.o.
Expand Down
6 changes: 0 additions & 6 deletions arch/x86/boot/a20.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ static void enable_a20_fast(void)

int enable_a20(void)
{
#ifdef CONFIG_X86_VOYAGER
/* On Voyager, a20_test() is unsafe? */
enable_a20_kbc();
return 0;
#else
int loops = A20_ENABLE_LOOPS;
int kbc_err;

Expand Down Expand Up @@ -164,5 +159,4 @@ int enable_a20(void)
}

return -1;
#endif
}
3 changes: 0 additions & 3 deletions arch/x86/boot/boot.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,6 @@ void probe_cards(int unsafe);
/* video-vesa.c */
void vesa_store_edid(void);

/* voyager.c */
int query_voyager(void);

#endif /* __ASSEMBLY__ */

#endif /* BOOT_BOOT_H */
5 changes: 0 additions & 5 deletions arch/x86/boot/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,6 @@ void main(void)
/* Query MCA information */
query_mca();

/* Voyager */
#ifdef CONFIG_X86_VOYAGER
query_voyager();
#endif

/* Query Intel SpeedStep (IST) information */
query_ist();

Expand Down
40 changes: 0 additions & 40 deletions arch/x86/boot/voyager.c

This file was deleted.

1 change: 0 additions & 1 deletion arch/x86/configs/i386_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ CONFIG_SPARSE_IRQ=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_VSMP is not set
# CONFIG_X86_RDC321X is not set
Expand Down
1 change: 0 additions & 1 deletion arch/x86/configs/x86_64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ CONFIG_SPARSE_IRQ=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_VSMP is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
Expand Down
17 changes: 0 additions & 17 deletions arch/x86/include/asm/mach-voyager/do_timer.h

This file was deleted.

26 changes: 0 additions & 26 deletions arch/x86/include/asm/mach-voyager/entry_arch.h

This file was deleted.

12 changes: 0 additions & 12 deletions arch/x86/include/asm/mach-voyager/setup_arch.h

This file was deleted.

61 changes: 0 additions & 61 deletions arch/x86/include/asm/vic.h

This file was deleted.

Loading

0 comments on commit 965c7ec

Please sign in to comment.