Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Browse Source 
* 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: use static initializers in xen-balloon.c
  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

Fix up trivial whitespace-conflicts in
 drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}
This commit is contained in:
Linus Torvalds 2011-11-06 20:13:34 -08:00
commit daedd8708f
8 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/xen/balloon.c
View File

@ -155,8 +155,7 @@ static struct page *balloon_retrieve(bool prefer_highmem)
if (PageHighMem(page)) { if (PageHighMem(page)) {
balloon_stats.balloon_high--; balloon_stats.balloon_high--;
inc_totalhigh_pages(); inc_totalhigh_pages();
} } else
else
balloon_stats.balloon_low--; balloon_stats.balloon_low--;
totalram_pages++; totalram_pages++;

7
drivers/xen/events.c
View File

@ -85,8 +85,7 @@ enum xen_irq_type {
* IPI - IPI vector * IPI - IPI vector
* EVTCHN - * EVTCHN -
*/ */
struct irq_info struct irq_info {
{
struct list_head list; struct list_head list;
enum xen_irq_type type; /* type */ enum xen_irq_type type; /* type */
unsigned irq; unsigned irq;
@ -282,9 +281,9 @@ static inline unsigned long active_evtchns(unsigned int cpu,
struct shared_info *sh, struct shared_info *sh,
unsigned int idx) unsigned int idx)
{ {
return (sh->evtchn_pending[idx] & return sh->evtchn_pending[idx] &
per_cpu(cpu_evtchn_mask, cpu)[idx] & per_cpu(cpu_evtchn_mask, cpu)[idx] &
~sh->evtchn_mask[idx]); ~sh->evtchn_mask[idx];
} }
static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)

3
drivers/xen/gntdev.c
View File

@ -193,9 +193,8 @@ static void gntdev_put_map(struct grant_map *map)
atomic_sub(map->count, &pages_mapped); 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); notify_remote_via_evtchn(map->notify.event);
}
if (map->pages) { if (map->pages) {
if (!use_ptemod) if (!use_ptemod)

2
drivers/xen/grant-table.c
View File

@ -193,7 +193,7 @@ int gnttab_query_foreign_access(grant_ref_t ref)
nflags = shared[ref].flags; nflags = shared[ref].flags;
return (nflags & (GTF_reading|GTF_writing)); return nflags & (GTF_reading|GTF_writing);
} }
EXPORT_SYMBOL_GPL(gnttab_query_foreign_access); EXPORT_SYMBOL_GPL(gnttab_query_foreign_access);

17
drivers/xen/xen-balloon.c
View File

@ -50,11 +50,6 @@ static struct sys_device balloon_sysdev;
static int register_balloon(struct sys_device *sysdev); static int register_balloon(struct sys_device *sysdev);
static struct xenbus_watch target_watch =
{
.node = "memory/target"
};
/* React to a change in the target key */ /* React to a change in the target key */
static void watch_target(struct xenbus_watch *watch, static void watch_target(struct xenbus_watch *watch,
const char **vec, unsigned int len) const char **vec, unsigned int len)
@ -73,6 +68,11 @@ static void watch_target(struct xenbus_watch *watch,
*/ */
balloon_set_new_target(new_target >> (PAGE_SHIFT - 10)); balloon_set_new_target(new_target >> (PAGE_SHIFT - 10));
} }
static struct xenbus_watch target_watch = {
.node = "memory/target",
.callback = watch_target,
};
static int balloon_init_watcher(struct notifier_block *notifier, static int balloon_init_watcher(struct notifier_block *notifier,
unsigned long event, unsigned long event,
@ -87,7 +87,9 @@ static int balloon_init_watcher(struct notifier_block *notifier,
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static struct notifier_block xenstore_notifier; static struct notifier_block xenstore_notifier = {
.notifier_call = balloon_init_watcher,
};
static int __init balloon_init(void) static int __init balloon_init(void)
{ {
@ -100,9 +102,6 @@ static int __init balloon_init(void)
register_xen_selfballooning(&balloon_sysdev); register_xen_selfballooning(&balloon_sysdev);
target_watch.callback = watch_target;
xenstore_notifier.notifier_call = balloon_init_watcher;
register_xenstore_notifier(&xenstore_notifier); register_xenstore_notifier(&xenstore_notifier);
return 0; return 0;

5
drivers/xen/xenbus/xenbus_probe.c
View File

@ -310,8 +310,7 @@ void xenbus_unregister_driver(struct xenbus_driver *drv)
} }
EXPORT_SYMBOL_GPL(xenbus_unregister_driver); EXPORT_SYMBOL_GPL(xenbus_unregister_driver);
struct xb_find_info struct xb_find_info {
{
struct xenbus_device *dev; struct xenbus_device *dev;
const char *nodename; const char *nodename;
}; };
@ -640,7 +639,7 @@ int xenbus_dev_cancel(struct device *dev)
EXPORT_SYMBOL_GPL(xenbus_dev_cancel); EXPORT_SYMBOL_GPL(xenbus_dev_cancel);
/* A flag to determine if xenstored is 'ready' (i.e. has started) */ /* A flag to determine if xenstored is 'ready' (i.e. has started) */
int xenstored_ready = 0; int xenstored_ready;
int register_xenstore_notifier(struct notifier_block *nb) int register_xenstore_notifier(struct notifier_block *nb)

3
drivers/xen/xenbus/xenbus_probe.h
View File

@ -36,8 +36,7 @@
#define XEN_BUS_ID_SIZE 20 #define XEN_BUS_ID_SIZE 20
struct xen_bus_type struct xen_bus_type {
{
char *root; char *root;
unsigned int levels; unsigned int levels;
int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename); int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);