The patch titled
ieee1394: raw1394: fix whitespace after x86_64 compat patch
has been added to the -mm tree. Its filename is
ieee1394-raw1394-fix-whitespace-after-x86_64.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ieee1394: raw1394: fix whitespace after x86_64 compat patch
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/raw1394.c | 54 ++++++++++++++++-------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff -puN drivers/ieee1394/raw1394.c~ieee1394-raw1394-fix-whitespace-after-x86_64 drivers/ieee1394/raw1394.c
--- 25/drivers/ieee1394/raw1394.c~ieee1394-raw1394-fix-whitespace-after-x86_64 Fri Jun 2 14:43:47 2006
+++ 25-akpm/drivers/ieee1394/raw1394.c Fri Jun 2 14:43:47 2006
@@ -408,34 +408,34 @@ static void fcp_request(struct hpsb_host
#ifdef CONFIG_COMPAT
struct compat_raw1394_req {
- __u32 type;
- __s32 error;
- __u32 misc;
+ __u32 type;
+ __s32 error;
+ __u32 misc;
- __u32 generation;
- __u32 length;
+ __u32 generation;
+ __u32 length;
- __u64 address;
+ __u64 address;
- __u64 tag;
+ __u64 tag;
- __u64 sendb;
- __u64 recvb;
-} __attribute__((packed));
+ __u64 sendb;
+ __u64 recvb;
+} __attribute__((packed));
static const char __user *raw1394_compat_write(const char __user *buf)
{
- struct compat_raw1394_req __user *cr = (typeof(cr)) buf;
+ struct compat_raw1394_req __user *cr = (typeof(cr)) buf;
struct raw1394_request __user *r;
r = compat_alloc_user_space(sizeof(struct raw1394_request));
#define C(x) __copy_in_user(&r->x, &cr->x, sizeof(r->x))
if (copy_in_user(r, cr, sizeof(struct compat_raw1394_req)) ||
- C(address) ||
- C(tag) ||
- C(sendb) ||
- C(recvb))
+ C(address) ||
+ C(tag) ||
+ C(sendb) ||
+ C(recvb))
return ERR_PTR(-EFAULT);
return (const char __user *)r;
}
@@ -443,11 +443,11 @@ static const char __user *raw1394_compat
#define P(x) __put_user(r->x, &cr->x)
-static int
+static int
raw1394_compat_read(const char __user *buf, struct raw1394_request *r)
{
- struct compat_raw1394_req __user *cr = (typeof(cr)) r;
- if (!access_ok(VERIFY_WRITE,cr,sizeof(struct compat_raw1394_req)) ||
+ struct compat_raw1394_req __user *cr = (typeof(cr)) r;
+ if (!access_ok(VERIFY_WRITE, cr, sizeof(struct compat_raw1394_req)) ||
P(type) ||
P(error) ||
P(misc) ||
@@ -512,18 +512,17 @@ static ssize_t raw1394_read(struct file
}
#ifdef CONFIG_COMPAT
- if (count == sizeof(struct compat_raw1394_req) &&
- sizeof(struct compat_raw1394_req) !=
- sizeof(struct raw1394_request)) {
+ if (count == sizeof(struct compat_raw1394_req) &&
+ sizeof(struct compat_raw1394_req) !=
+ sizeof(struct raw1394_request)) {
ret = raw1394_compat_read(buffer, &req->req);
-
- } else
+ } else
#endif
{
if (copy_to_user(buffer, &req->req, sizeof(req->req))) {
ret = -EFAULT;
goto out;
- }
+ }
ret = (ssize_t) sizeof(struct raw1394_request);
}
out:
@@ -2348,7 +2347,6 @@ static int state_connected(struct file_i
return handle_async_request(fi, req, node);
}
-
static ssize_t raw1394_write(struct file *file, const char __user * buffer,
size_t count, loff_t * offset_is_ignored)
{
@@ -2357,9 +2355,9 @@ static ssize_t raw1394_write(struct file
ssize_t retval = 0;
#ifdef CONFIG_COMPAT
- if (count == sizeof(struct compat_raw1394_req) &&
- sizeof(struct compat_raw1394_req) !=
- sizeof(struct raw1394_request)) {
+ if (count == sizeof(struct compat_raw1394_req) &&
+ sizeof(struct compat_raw1394_req) !=
+ sizeof(struct raw1394_request)) {
buffer = raw1394_compat_write(buffer);
if (IS_ERR(buffer))
return PTR_ERR(buffer);
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
ieee1394-ohci1394c-function-calls-without.patch
ieee1394-sbp2-make-tsb42aa9-workaround-specific.patch
ieee1394-raw1394-fix-whitespace-after-x86_64.patch
ieee1394-ieee1394-ohci1394-cycletoolong.patch
ieee1394-ieee1394-support-for-slow-links-or-slow.patch
ieee1394-ieee1394-save-ram-by-using-a-single.patch
ieee1394-sbp2-remove-manipulation-of-inquiry.patch
ieee1394-sbp2-log-number-of-supported-concurrent.patch
ieee1394-ieee1394-extend-lowlevel-api-for.patch
ieee1394-ohci1394-set-address-range-properties.patch
ieee1394-ohci1394-make-phys_dma-parameter.patch
ieee1394-sbp2-sbp2-remove-ohci1394-specific.patch
ieee1394-sbp2-fix-s800-transfers-if-phys_dma-is.patch
ieee1394-update-feature-removal-of-obsolete.patch
ieee1394-sbp2-provide-helptext-for.patch
ieee1394-sbp2-use-__attribute__packed-for.patch
ieee1394-speed-up-of-dma_region_sync_for_cpu.patch
ieee1394_core-switch-to-kthread-api.patch
eth1394-endian-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
