Skip to content

Commit

Permalink
Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub…
Browse files Browse the repository at this point in the history
…/scm/linux/kernel/git/xen/tip

Pull Xen bugfixes from Konrad Rzeszutek Wilk:
 "This has an healthy amount of code being removed - which we do not use
  anymore (the only user of it was ia64 Xen which had been removed
  already).  The other bug-fixes are to make Xen ARM be able to use the
  new event channel mechanism and proper export of header files to
  user-space.

  Summary:
   - Fix ARM and Xen FIFO not working.
   - Remove more Xen ia64 vestigates.
   - Fix UAPI missing Xen files"

* tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  ia64/xen: Remove Xen support for ia64 even more
  xen: install xen/gntdev.h and xen/gntalloc.h
  xen/events: bind all new interdomain events to VCPU0
  • Loading branch information
torvalds committed Feb 12, 2014
2 parents 9398a10 + d8320b2 commit 4675348
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 338 deletions.
1 change: 0 additions & 1 deletion drivers/xen/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ xen-pad-$(CONFIG_X86) += xen-acpi-pad.o
dom0-$(CONFIG_X86) += pcpu.o
obj-$(CONFIG_XEN_DOM0) += $(dom0-y)
obj-$(CONFIG_BLOCK) += biomerge.o
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o
obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o
obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o
Expand Down
2 changes: 2 additions & 0 deletions drivers/xen/events/events_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,8 @@ int bind_evtchn_to_irq(unsigned int evtchn)
irq = ret;
goto out;
}
/* New interdomain events are bound to VCPU 0. */
bind_evtchn_to_cpu(evtchn, 0);
} else {
struct irq_info *info = info_for_irq(irq);
WARN_ON(info == NULL || info->type != IRQT_EVTCHN);
Expand Down
219 changes: 0 additions & 219 deletions drivers/xen/xencomm.c

This file was deleted.

2 changes: 2 additions & 0 deletions include/uapi/xen/Kbuild
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# UAPI Header export list
header-y += evtchn.h
header-y += gntalloc.h
header-y += gntdev.h
header-y += privcmd.h
File renamed without changes.
File renamed without changes.
41 changes: 0 additions & 41 deletions include/xen/interface/xencomm.h

This file was deleted.

77 changes: 0 additions & 77 deletions include/xen/xencomm.h

This file was deleted.

0 comments on commit 4675348

Please sign in to comment.