From 5dca7733725c5aac7b965f195dbd42f6ec2db580 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Thu, 25 Aug 2011 13:06:57 -0500 Subject: [PATCH] --- yaml --- r: 267327 b: refs/heads/master c: 191c5cf1ffc8acf61cd2d2407052ced1a1116130 h: refs/heads/master i: 267325: dac936daf9c6ef6fee02b0b06f655c4f06484772 267323: 472224fdeee6e3b8f47cde650eedd1f7bcdc6e99 267319: 2ca2a04836cd6c9d9dad79eb490d3bf4894f2839 267311: 7e049dcf708d61461443cd0f33f13e2dbcc45e9c 267295: 945f4e32fbcb630265c228b92d735ed17db3630a 267263: ed20d5e1841eeedddf130c032b316d7a87d55cc3 v: v3 --- [refs] | 2 +- trunk/drivers/tty/ehv_bytechan.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9be4cb383fc3..71dfc6067549 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da4e40e271a30ecf8b87f70619cca93c25ed0199 +refs/heads/master: 191c5cf1ffc8acf61cd2d2407052ced1a1116130 diff --git a/trunk/drivers/tty/ehv_bytechan.c b/trunk/drivers/tty/ehv_bytechan.c index e67f70bbf0ac..f733718bf8e7 100644 --- a/trunk/drivers/tty/ehv_bytechan.c +++ b/trunk/drivers/tty/ehv_bytechan.c @@ -226,10 +226,6 @@ void __init udbg_init_ehv_bc(void) unsigned int rx_count, tx_count; unsigned int ret; - /* Check if we're running as a guest of a hypervisor */ - if (!(mfmsr() & MSR_GS)) - return; - /* Verify the byte channel handle */ ret = ev_byte_channel_poll(CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE, &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, unsigned int count) { - unsigned int handle = (unsigned int)co->data; + unsigned int handle = (uintptr_t)co->data; char s2[EV_BYTE_CHANNEL_MAX_BYTES]; unsigned int i, j = 0; char c; @@ -352,7 +348,7 @@ static int __init ehv_bc_console_init(void) CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE); #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(), otherwise it won't work. However, we don't want to enumerate all the