Merge branch 'stable/cleanups-3.2.rebased' into stable/for-linus-3.3.rebased

* stable/cleanups-3.2.rebased:
  Xen: fix braces and tabs coding style issue in xenbus_probe.c
  Xen: fix braces coding style issue in xenbus_probe.h
  Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c
  Xen: fix braces coding style issue in gntdev.c and grant-table.c
  Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c
  Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c

Conflicts:
	drivers/xen/balloon.c
	drivers/xen/gntdev.c

diff --cc drivers/xen/balloon.c
index 7345c1da64aea2489aa0881688049c388d93416a,61c0ee7aa7dd9623df1ff48f225a66e0b4e349e8..5d1cfc886edd30d4ad170c16eb886cdea6a66730
--- 1/drivers/xen/balloon.c
--- 2/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@@ -374,17 -373,16 +373,17 @@@ EXPORT_SYMBOL_GPL(balloon_set_new_targe
   * alloc_xenballooned_pages - get pages that have been ballooned out
   * @nr_pages: Number of pages to get
   * @pages: pages returned
 + * @highmem: allow highmem pages
   * @return 0 on success, error otherwise
   */
- int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
 -int alloc_xenballooned_pages(int nr_pages, struct page **pages)
++sint alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
  {
        int pgno = 0;
-       struct page* page;
+       struct page *page;
        mutex_lock(&balloon_mutex);
        while (pgno < nr_pages) {
 -              page = balloon_retrieve(true);
 -              if (page) {
 +              page = balloon_retrieve(highmem);
 +              if (page && (highmem || !PageHighMem(page))) {
                        pages[pgno++] = page;
                } else {
                        enum bp_state st;

diff --cc drivers/xen/events.c
index 39572b3172a760986361b9e951fad99fe9c1e523,be7c31d55fd7df9f57af30b01a8ab6a85d8bdf5d..b2d71266f6ed0ff8b589320688a8d67a26153917
--- 1/drivers/xen/events.c
--- 2/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@@ -85,10 -85,8 +85,9 @@@ enum xen_irq_type 
   *    IPI - IPI vector
   *    EVTCHN -
   */
- struct irq_info
- {
+ struct irq_info {
        struct list_head list;
 +      int refcnt;
        enum xen_irq_type type; /* type */
        unsigned irq;
        unsigned short evtchn;  /* event channel */

diff --cc drivers/xen/gntdev.c
index f52f661f8f82c731b678891bf1d27149b6f63421,772a5b8bbf2e8b16a2ca73ce204d3a403261f775..8c9e7b306a4c8d2e708d68fabdc83b7db0c134b4
--- 1/drivers/xen/gntdev.c
--- 2/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@@ -193,10 -188,8 +193,9 @@@ static void gntdev_put_map(struct grant
  
        atomic_sub(map->count, &pages_mapped);
  
-       if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT) {
+       if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT)
                notify_remote_via_evtchn(map->notify.event);
-       }
 +              evtchn_put(map->notify.event);
  
        if (map->pages) {
                if (!use_ptemod)

diff --cc drivers/xen/grant-table.c
Simple merge