From: stoyboyker@gmail.com
To: linux-kernel@vger.kernel.org
Cc: Stoyan Gaydarov <stoyboyker@gmail.com>,
cooloney@kernel.org, uclinux-dist-devel@blackfin.uclinux.org
Subject: [PATCH 04/13] [blackfin] changed ioctls to unlocked
Date: Tue, 24 Mar 2009 16:12:39 -0500 [thread overview]
Message-ID: <1237929168-15341-5-git-send-email-stoyboyker@gmail.com> (raw)
From: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
arch/blackfin/mach-bf561/coreb.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c
index 8598098..9ad89af 100644
--- a/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@ -220,9 +220,10 @@ static int coreb_release(struct inode *inode, struct file *file)
return 0;
}
-static int coreb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long coreb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
+ lock_kernel();
+
int retval = 0;
int coreb_index = 0;
@@ -289,6 +290,7 @@ static int coreb_ioctl(struct inode *inode, struct file *file,
#endif
}
+ unlock_kernel();
return retval;
}
@@ -297,7 +299,7 @@ static struct file_operations coreb_fops = {
.llseek = coreb_lseek,
.read = coreb_read,
.write = coreb_write,
- .ioctl = coreb_ioctl,
+ .unlocked_ioctl = coreb_ioctl,
.open = coreb_open,
.release = coreb_release
};
--
1.6.2
next reply other threads:[~2009-03-24 21:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-24 21:12 stoyboyker [this message]
2009-03-25 2:07 ` [Uclinux-dist-devel] " gyang
2009-03-25 2:31 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1237929168-15341-5-git-send-email-stoyboyker@gmail.com \
--to=stoyboyker@gmail.com \
--cc=cooloney@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=uclinux-dist-devel@blackfin.uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®