diff options
| author | Linus Torvalds | 2011-11-07 05:13:34 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-07 05:13:34 +0100 |
| commit | daedd8708fe7707ed651bb1c83162f25c48a947c (patch) | |
| tree | 424e9aaa7d6f686b729257e753e4edf91fecb73c /drivers/xen/grant-table.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | xen: use static initializers in xen-balloon.c (diff) | |
| download | kernel-qcow2-linux-daedd8708fe7707ed651bb1c83162f25c48a947c.tar.gz kernel-qcow2-linux-daedd8708fe7707ed651bb1c83162f25c48a947c.tar.xz kernel-qcow2-linux-daedd8708fe7707ed651bb1c83162f25c48a947c.zip | |
Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* '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}
Diffstat (limited to 'drivers/xen/grant-table.c')
| -rw-r--r-- | drivers/xen/grant-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 8c71ab801756..bf1c094f4ebf 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -193,7 +193,7 @@ int gnttab_query_foreign_access(grant_ref_t ref) nflags = shared[ref].flags; - return (nflags & (GTF_reading|GTF_writing)); + return nflags & (GTF_reading|GTF_writing); } EXPORT_SYMBOL_GPL(gnttab_query_foreign_access); |