git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
kernel
/
rtlx.c
diff --git
a/arch/mips/kernel/rtlx.c
b/arch/mips/kernel/rtlx.c
index
caf777f
..
5a99e3e
100644
(file)
--- a/
arch/mips/kernel/rtlx.c
+++ b/
arch/mips/kernel/rtlx.c
@@
-61,16
+61,16
@@
static int sp_stopping = 0;
extern void *vpe_get_shared(int index);
extern void *vpe_get_shared(int index);
-static void rtlx_dispatch(
struct pt_regs *regs
)
+static void rtlx_dispatch(
void
)
{
{
- do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ
, regs
);
+ do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ);
}
/* Interrupt handler may be called before rtlx_init has otherwise had
a chance to run.
*/
}
/* Interrupt handler may be called before rtlx_init has otherwise had
a chance to run.
*/
-static irqreturn_t rtlx_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t rtlx_interrupt(int irq, void *dev_id)
{
int i;
{
int i;
@@
-415,7
+415,7
@@
static unsigned int file_poll(struct file *file, poll_table * wait)
int minor;
unsigned int mask = 0;
int minor;
unsigned int mask = 0;
- minor = iminor(file->f_dentry->d_inode);
+ minor = iminor(file->f_
path.
dentry->d_inode);
poll_wait(file, &channel_wqs[minor].rt_queue, wait);
poll_wait(file, &channel_wqs[minor].lx_queue, wait);
poll_wait(file, &channel_wqs[minor].rt_queue, wait);
poll_wait(file, &channel_wqs[minor].lx_queue, wait);
@@
-437,7
+437,7
@@
static unsigned int file_poll(struct file *file, poll_table * wait)
static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
loff_t * ppos)
{
static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
loff_t * ppos)
{
- int minor = iminor(file->f_dentry->d_inode);
+ int minor = iminor(file->f_
path.
dentry->d_inode);
/* data available? */
if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
/* data available? */
if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@
-454,7
+454,7
@@
static ssize_t file_write(struct file *file, const char __user * buffer,
struct rtlx_channel *rt;
DECLARE_WAITQUEUE(wait, current);
struct rtlx_channel *rt;
DECLARE_WAITQUEUE(wait, current);
- minor = iminor(file->f_dentry->d_inode);
+ minor = iminor(file->f_
path.
dentry->d_inode);
rt = &rtlx->channel[minor];
/* any space left... */
rt = &rtlx->channel[minor];
/* any space left... */
@@
-487,7
+487,7
@@
static struct file_operations rtlx_fops = {
static struct irqaction rtlx_irq = {
.handler = rtlx_interrupt,
static struct irqaction rtlx_irq = {
.handler = rtlx_interrupt,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.name = "RTLX",
};
.name = "RTLX",
};