Skip to content

Commit c5f9ee3

Browse files
author
H. Peter Anvin
committed
x86, platforms: Remove SGI Visual Workstation
The SGI Visual Workstation seems to be dead; remove support so we don't have to continue maintaining it. Cc: Andrey Panin <pazke@donpac.ru> Cc: Michael Reed <mdr@sgi.com> Link: http://lkml.kernel.org/r/530CFD6C.7040705@zytor.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1 parent 7cf6c94 commit c5f9ee3

File tree

33 files changed

+5
-6454
lines changed

33 files changed

+5
-6454
lines changed

Documentation/00-INDEX

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,6 @@ serial-console.txt
401401
- how to set up Linux with a serial line console as the default.
402402
sgi-ioc4.txt
403403
- description of the SGI IOC4 PCI (multi function) device.
404-
sgi-visws.txt
405-
- short blurb on the SGI Visual Workstations.
406404
sh/
407405
- directory with info on porting Linux to a new architecture.
408406
smsc_ece1099.txt

Documentation/sgi-visws.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

Documentation/sound/oss/vwsnd

Lines changed: 0 additions & 293 deletions
This file was deleted.

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7757,13 +7757,6 @@ F: Documentation/ia64/serial.txt
77577757
F: drivers/tty/serial/ioc?_serial.c
77587758
F: include/linux/ioc?.h
77597759

7760-
SGI VISUAL WORKSTATION 320 AND 540
7761-
M: Andrey Panin <pazke@donpac.ru>
7762-
L: linux-visws-devel@lists.sf.net
7763-
W: http://linux-visws.sf.net
7764-
S: Maintained for 2.6.
7765-
F: Documentation/sgi-visws.txt
7766-
77677760
SGI XP/XPC/XPNET DRIVER
77687761
M: Cliff Whickman <cpw@sgi.com>
77697762
M: Robin Holt <robinmholt@gmail.com>

arch/x86/Kconfig

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -517,19 +517,6 @@ config X86_SUPPORTS_MEMORY_FAILURE
517517
depends on X86_64 || !SPARSEMEM
518518
select ARCH_SUPPORTS_MEMORY_FAILURE
519519

520-
config X86_VISWS
521-
bool "SGI 320/540 (Visual Workstation)"
522-
depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
523-
depends on X86_32_NON_STANDARD
524-
---help---
525-
The SGI Visual Workstation series is an IA32-based workstation
526-
based on SGI systems chips with some legacy PC hardware attached.
527-
528-
Say Y here to create a kernel to run on the SGI 320 or 540.
529-
530-
A kernel compiled for the Visual Workstation will run on general
531-
PCs as well. See <file:Documentation/sgi-visws.txt> for details.
532-
533520
config STA2X11
534521
bool "STA2X11 Companion Chip Support"
535522
depends on X86_32_NON_STANDARD && PCI
@@ -860,10 +847,6 @@ config X86_IO_APIC
860847
def_bool y
861848
depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
862849

863-
config X86_VISWS_APIC
864-
def_bool y
865-
depends on X86_32 && X86_VISWS
866-
867850
config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
868851
bool "Reroute for broken boot IRQs"
869852
depends on X86_IO_APIC

arch/x86/include/asm/fixmap.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ enum fixed_addresses {
9797
#ifdef CONFIG_X86_IO_APIC
9898
FIX_IO_APIC_BASE_0,
9999
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
100-
#endif
101-
#ifdef CONFIG_X86_VISWS_APIC
102-
FIX_CO_CPU, /* Cobalt timer */
103-
FIX_CO_APIC, /* Cobalt APIC Redirection Table */
104-
FIX_LI_PCIA, /* Lithium PCI Bridge A */
105-
FIX_LI_PCIB, /* Lithium PCI Bridge B */
106100
#endif
107101
FIX_RO_IDT, /* Virtual mapping for read-only IDT */
108102
#ifdef CONFIG_X86_32

arch/x86/include/asm/hw_irq.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ extern void trace_call_function_single_interrupt(void);
9898
#define IO_APIC_IRQ(x) (((x) >= NR_IRQS_LEGACY) || ((1<<(x)) & io_apic_irqs))
9999
extern unsigned long io_apic_irqs;
100100

101-
extern void init_VISWS_APIC_irqs(void);
102101
extern void setup_IO_APIC(void);
103102
extern void disable_IO_APIC(void);
104103

arch/x86/include/asm/setup.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ static inline void vsmp_init(void) { }
3939

4040
void setup_bios_corruption_check(void);
4141

42-
#ifdef CONFIG_X86_VISWS
43-
extern void visws_early_detect(void);
44-
#else
45-
static inline void visws_early_detect(void) { }
46-
#endif
47-
4842
extern unsigned long saved_video_mode;
4943

5044
extern void reserve_standard_io_resources(void);

0 commit comments

Comments
 (0)