UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tty/powerpc: fix build break with ehv_bytechan.c on allyesconfig 

The ePAPR hypervisor byte channel driver is supposed to work on all
ePAPR-compliant embedded PowerPC systems, but it had a reference to the MSR_GS
bit, which is available only on Book-E systems.

Also fix a couple integer-to-pointer typecast problems.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Timur Tabi 2011-08-25 13:06:57 -05:00 committed by Greg Kroah-Hartman
parent da4e40e271
commit 191c5cf1ff
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/tty/ehv_bytechan.c
View File

@ -226,10 +226,6 @@ void __init udbg_init_ehv_bc(void)
unsigned int rx_count, tx_count; unsigned int rx_count, tx_count;
unsigned int ret; unsigned int ret;
/* Check if we're running as a guest of a hypervisor */
if (!(mfmsr() & MSR_GS))
return;
/* Verify the byte channel handle */ /* Verify the byte channel handle */
ret = ev_byte_channel_poll(CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE, ret = ev_byte_channel_poll(CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE,
&rx_count, &tx_count); &rx_count, &tx_count);
@ -286,7 +282,7 @@ static int ehv_bc_console_byte_channel_send(unsigned int handle, const char *s,
static void ehv_bc_console_write(struct console *co, const char *s, static void ehv_bc_console_write(struct console *co, const char *s,
unsigned int count) unsigned int count)
{ {
unsigned int handle = (unsigned int)co->data; unsigned int handle = (uintptr_t)co->data;
char s2[EV_BYTE_CHANNEL_MAX_BYTES]; char s2[EV_BYTE_CHANNEL_MAX_BYTES];
unsigned int i, j = 0; unsigned int i, j = 0;
char c; char c;
@ -352,7 +348,7 @@ static int __init ehv_bc_console_init(void)
CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE); CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE);
#endif #endif
ehv_bc_console.data = (void *)stdout_bc; ehv_bc_console.data = (void *)(uintptr_t)stdout_bc;
/* add_preferred_console() must be called before register_console(), /* add_preferred_console() must be called before register_console(),
otherwise it won't work. However, we don't want to enumerate all the otherwise it won't work. However, we don't want to enumerate all the