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

Commit e42faf55 authored Oct 24, 2016 by Matt Turner

alpha: Fix build error without CONFIG_VGA_HOSE.



pci_vga_hose is #defined to 0 in include/asm/vga.h if CONFIG_VGA_HOSE is
not set.

Signed-off-by: Matt Turner <mattst88@gmail.com>

parent 143c97cc

arch/alpha/kernel/core_marvel.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,7 @@ marvel_io7_present(gct6_node *node)
		static void __init
		marvel_find_console_vga_hose(void)
		{
		#ifdef CONFIG_VGA_HOSE
		u64 pu64 = (u64 )((u64)hwrpb + hwrpb->ctbt_offset);

		if (pu64[7] == 3) { /* TERM_TYPE == graphics */
		@@ -402,6 +403,7 @@ marvel_find_console_vga_hose(void)
		pci_vga_hose = hose;
		}
		}
		#endif
		}

		gct6_search_struct gct_wanted_node_list[] = {

arch/alpha/kernel/core_titan.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -461,6 +461,7 @@ titan_ioremap(unsigned long addr, unsigned long size)
		unsigned long *ptes;
		unsigned long pfn;

		#ifdef CONFIG_VGA_HOSE
		/*
		* Adjust the address and hose, if necessary.
		*/
		@@ -468,6 +469,7 @@ titan_ioremap(unsigned long addr, unsigned long size)
		h = pci_vga_hose->index;
		addr += pci_vga_hose->mem_space->start;
		}
		#endif

		/*
		* Find the hose.