diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-12 11:14:33 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-12 11:14:33 -0400 |
commit | 25a765b7f05cb8460fa01b54568894b20e184862 (patch) | |
tree | 0b56db57b4d9f912393ab303c269e0fe6cdf8635 /drivers/tty/hvc | |
parent | 9d2be9287107695708e6aae5105a8a518a6cb4d0 (diff) | |
parent | 64282278989d5b0398dcb3ba7904cb00c621dc35 (diff) |
Merge branch 'x86/platform' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into stable/for-linus-3.7
* 'x86/platform' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (9690 commits)
x86: Document x86_init.paging.pagetable_init()
x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()
x86: Move paging_init() call to x86_init.paging.pagetable_init()
x86: Rename pagetable_setup_start() to pagetable_init()
x86: Remove base argument from x86_init.paging.pagetable_setup_start
Linux 3.6-rc5
HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
Remove user-triggerable BUG from mpol_to_str
xen/pciback: Fix proper FLR steps.
uml: fix compile error in deliver_alarm()
dj: memory scribble in logi_dj
Fix order of arguments to compat_put_time[spec|val]
xen: Use correct masking in xen_swiotlb_alloc_coherent.
xen: fix logical error in tlb flushing
xen/p2m: Fix one-off error in checking the P2M tree directory.
powerpc: Don't use __put_user() in patch_instruction
powerpc: Make sure IPI handlers see data written by IPI senders
powerpc: Restore correct DSCR in context switch
powerpc: Fix DSCR inheritance in copy_thread()
powerpc: Keep thread.dscr and thread.dscr_inherit in sync
...
Diffstat (limited to 'drivers/tty/hvc')
-rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index dc07f56d66b5..2944ff88fdc0 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c | |||
@@ -211,11 +211,10 @@ static int xen_hvm_console_init(void) | |||
211 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); | 211 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); |
212 | if (!info) | 212 | if (!info) |
213 | return -ENOMEM; | 213 | return -ENOMEM; |
214 | } | 214 | } else if (info->intf != NULL) { |
215 | 215 | /* already configured */ | |
216 | /* already configured */ | ||
217 | if (info->intf != NULL) | ||
218 | return 0; | 216 | return 0; |
217 | } | ||
219 | /* | 218 | /* |
220 | * If the toolstack (or the hypervisor) hasn't set these values, the | 219 | * If the toolstack (or the hypervisor) hasn't set these values, the |
221 | * default value is 0. Even though mfn = 0 and evtchn = 0 are | 220 | * default value is 0. Even though mfn = 0 and evtchn = 0 are |
@@ -261,12 +260,10 @@ static int xen_pv_console_init(void) | |||
261 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); | 260 | info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO); |
262 | if (!info) | 261 | if (!info) |
263 | return -ENOMEM; | 262 | return -ENOMEM; |
264 | } | 263 | } else if (info->intf != NULL) { |
265 | 264 | /* already configured */ | |
266 | /* already configured */ | ||
267 | if (info->intf != NULL) | ||
268 | return 0; | 265 | return 0; |
269 | 266 | } | |
270 | info->evtchn = xen_start_info->console.domU.evtchn; | 267 | info->evtchn = xen_start_info->console.domU.evtchn; |
271 | info->intf = mfn_to_virt(xen_start_info->console.domU.mfn); | 268 | info->intf = mfn_to_virt(xen_start_info->console.domU.mfn); |
272 | info->vtermno = HVC_COOKIE; | 269 | info->vtermno = HVC_COOKIE; |