Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965c7eca authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: remove the Voyager 32-bit subarch 



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: default avatarIngo Molnar <mingo@elte.hu>
parent 8425091f

arch/x86/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -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.
@@ -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"

arch/x86/boot/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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.

arch/x86/boot/a20.c

+0 −6
Original line number Diff line number Diff line
@@ -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;
@@ -164,5 +159,4 @@ int enable_a20(void) 
       }

       

       return -1;

#endif

}

arch/x86/boot/boot.h

+0 −3
Original line number Diff line number Diff line
@@ -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 */

arch/x86/boot/main.c

+0 −5
Original line number Diff line number Diff line
@@ -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();