evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] ppc: Fix build with CONFIG_CHRP not set

Browse source 
Building ARCH=ppc for multiplatforms with CONFIG_CHRP not set fails
due to some unshielded code in xmon

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt 2005-11-16 13:40:43 +11:00 • committed by Paul Mackerras
parent 94b212c29f
commit d3ed658320
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/ppc/xmon/start.c
View file

@ -184,7 +184,9 @@ xmon_map_scc(void)
sccc = base + (addr & ~PAGE_MASK); sccc = base + (addr & ~PAGE_MASK);
sccd = sccc + 0x10; sccd = sccc + 0x10;
} else { }
#ifdef CONFIG_PPC_CHRP
else {
base = (volatile unsigned char *) isa_io_base; base = (volatile unsigned char *) isa_io_base;
if (_machine == _MACH_chrp) if (_machine == _MACH_chrp)
base = (volatile unsigned char *) base = (volatile unsigned char *)
@ -200,6 +202,7 @@ xmon_map_scc(void)
RXRDY = 1; RXRDY = 1;
DLAB = 0x80; DLAB = 0x80;
} }
#endif /* CONFIG_PPC_CHRP */
#elif defined(CONFIG_GEMINI) #elif defined(CONFIG_GEMINI)
/* should already be mapped by the kernel boot */ /* should already be mapped by the kernel boot */
sccc = (volatile unsigned char *) 0xffeffb0d; sccc = (volatile unsigned char *) 0xffeffb0d;