Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
This commit is contained in:
Linus Torvalds
@ -502,8 +502,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set,
|
||||
while(1) {
|
||||
long tmp = 0;
|
||||
|
||||
current->state = TASK_INTERRUPTIBLE;
|
||||
expire = schedule_timeout(expire);
|
||||
expire = schedule_timeout_interruptible(expire);
|
||||
|
||||
for (i=0; i<=4; i++)
|
||||
tmp |= (current->pending.signal.sig[i] & kset.sig[i]);
|
||||
|
||||
@ -20,42 +20,42 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/init.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/elf.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/syscalls.h>
|
||||
#include <linux/moduleloader.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/wait.h>
|
||||
#include <asm/mipsmtregs.h>
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/atomic.h>
|
||||
#include <asm/bitops.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/rtlx.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#define RTLX_MAJOR 64
|
||||
#define RTLX_TARG_VPE 1
|
||||
|
||||
struct rtlx_info *rtlx;
|
||||
static struct rtlx_info *rtlx;
|
||||
static int major;
|
||||
static char module_name[] = "rtlx";
|
||||
static inline int spacefree(int read, int write, int size);
|
||||
static struct irqaction irq;
|
||||
static int irq_num;
|
||||
|
||||
static inline int spacefree(int read, int write, int size)
|
||||
{
|
||||
if (read == write) {
|
||||
/*
|
||||
* never fill the buffer completely, so indexes are always
|
||||
* equal if empty and only empty, or !equal if data available
|
||||
*/
|
||||
return size - 1;
|
||||
}
|
||||
|
||||
return ((read + size - write) % size) - 1;
|
||||
}
|
||||
|
||||
static struct chan_waitqueues {
|
||||
wait_queue_head_t rt_queue;
|
||||
wait_queue_head_t lx_queue;
|
||||
} channel_wqs[RTLX_CHANNELS];
|
||||
|
||||
static struct irqaction irq;
|
||||
static int irq_num;
|
||||
|
||||
extern void *vpe_get_shared(int index);
|
||||
|
||||
static void rtlx_dispatch(struct pt_regs *regs)
|
||||
@ -63,9 +63,8 @@ static void rtlx_dispatch(struct pt_regs *regs)
|
||||
do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ, regs);
|
||||
}
|
||||
|
||||
irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
static irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
{
|
||||
irqreturn_t r = IRQ_HANDLED;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < RTLX_CHANNELS; i++) {
|
||||
@ -75,30 +74,7 @@ irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
|
||||
wake_up_interruptible(&channel_wqs[i].lx_queue);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
void dump_rtlx(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
printk("id 0x%lx state %d\n", rtlx->id, rtlx->state);
|
||||
|
||||
for (i = 0; i < RTLX_CHANNELS; i++) {
|
||||
struct rtlx_channel *chan = &rtlx->channel[i];
|
||||
|
||||
printk(" rt_state %d lx_state %d buffer_size %d\n",
|
||||
chan->rt_state, chan->lx_state, chan->buffer_size);
|
||||
|
||||
printk(" rt_read %d rt_write %d\n",
|
||||
chan->rt_read, chan->rt_write);
|
||||
|
||||
printk(" lx_read %d lx_write %d\n",
|
||||
chan->lx_read, chan->lx_write);
|
||||
|
||||
printk(" rt_buffer <%s>\n", chan->rt_buffer);
|
||||
printk(" lx_buffer <%s>\n", chan->lx_buffer);
|
||||
}
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
/* call when we have the address of the shared structure from the SP side. */
|
||||
@ -108,7 +84,7 @@ static int rtlx_init(struct rtlx_info *rtlxi)
|
||||
|
||||
if (rtlxi->id != RTLX_ID) {
|
||||
printk(KERN_WARNING "no valid RTLX id at 0x%p\n", rtlxi);
|
||||
return (-ENOEXEC);
|
||||
return -ENOEXEC;
|
||||
}
|
||||
|
||||
/* initialise the wait queues */
|
||||
@ -120,9 +96,8 @@ static int rtlx_init(struct rtlx_info *rtlxi)
|
||||
/* set up for interrupt handling */
|
||||
memset(&irq, 0, sizeof(struct irqaction));
|
||||
|
||||
if (cpu_has_vint) {
|
||||
if (cpu_has_vint)
|
||||
set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);
|
||||
}
|
||||
|
||||
irq_num = MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ;
|
||||
irq.handler = rtlx_interrupt;
|
||||
@ -132,7 +107,8 @@ static int rtlx_init(struct rtlx_info *rtlxi)
|
||||
setup_irq(irq_num, &irq);
|
||||
|
||||
rtlx = rtlxi;
|
||||
return (0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* only allow one open process at a time to open each channel */
|
||||
@ -147,36 +123,36 @@ static int rtlx_open(struct inode *inode, struct file *filp)
|
||||
if (rtlx == NULL) {
|
||||
struct rtlx_info **p;
|
||||
if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
|
||||
printk(" vpe_get_shared is NULL. Has an SP program been loaded?\n");
|
||||
return (-EFAULT);
|
||||
printk(KERN_ERR "vpe_get_shared is NULL. "
|
||||
"Has an SP program been loaded?\n");
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
if (*p == NULL) {
|
||||
printk(" vpe_shared %p %p\n", p, *p);
|
||||
return (-EFAULT);
|
||||
printk(KERN_ERR "vpe_shared %p %p\n", p, *p);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
if ((ret = rtlx_init(*p)) < 0)
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
chan = &rtlx->channel[minor];
|
||||
|
||||
/* already open? */
|
||||
if (chan->lx_state == RTLX_STATE_OPENED)
|
||||
return (-EBUSY);
|
||||
if (test_and_set_bit(RTLX_STATE_OPENED, &chan->lx_state))
|
||||
return -EBUSY;
|
||||
|
||||
chan->lx_state = RTLX_STATE_OPENED;
|
||||
return (0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rtlx_release(struct inode *inode, struct file *filp)
|
||||
{
|
||||
int minor;
|
||||
int minor = MINOR(inode->i_rdev);
|
||||
|
||||
minor = MINOR(inode->i_rdev);
|
||||
rtlx->channel[minor].lx_state = RTLX_STATE_UNUSED;
|
||||
return (0);
|
||||
clear_bit(RTLX_STATE_OPENED, &rtlx->channel[minor].lx_state);
|
||||
smp_mb__after_clear_bit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned int rtlx_poll(struct file *file, poll_table * wait)
|
||||
@ -199,12 +175,13 @@ static unsigned int rtlx_poll(struct file *file, poll_table * wait)
|
||||
if (spacefree(chan->rt_read, chan->rt_write, chan->buffer_size))
|
||||
mask |= POLLOUT | POLLWRNORM;
|
||||
|
||||
return (mask);
|
||||
return mask;
|
||||
}
|
||||
|
||||
static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
|
||||
loff_t * ppos)
|
||||
{
|
||||
unsigned long failed;
|
||||
size_t fl = 0L;
|
||||
int minor;
|
||||
struct rtlx_channel *lx;
|
||||
@ -216,7 +193,7 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
|
||||
/* data available? */
|
||||
if (lx->lx_write == lx->lx_read) {
|
||||
if (file->f_flags & O_NONBLOCK)
|
||||
return (0); // -EAGAIN makes cat whinge
|
||||
return 0; /* -EAGAIN makes cat whinge */
|
||||
|
||||
/* go to sleep */
|
||||
add_wait_queue(&channel_wqs[minor].lx_queue, &wait);
|
||||
@ -232,39 +209,39 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
|
||||
}
|
||||
|
||||
/* find out how much in total */
|
||||
count = min( count,
|
||||
(size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) % lx->buffer_size);
|
||||
count = min(count,
|
||||
(size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) % lx->buffer_size);
|
||||
|
||||
/* then how much from the read pointer onwards */
|
||||
fl = min( count, (size_t)lx->buffer_size - lx->lx_read);
|
||||
fl = min(count, (size_t)lx->buffer_size - lx->lx_read);
|
||||
|
||||
copy_to_user (buffer, &lx->lx_buffer[lx->lx_read], fl);
|
||||
failed = copy_to_user (buffer, &lx->lx_buffer[lx->lx_read], fl);
|
||||
if (failed) {
|
||||
count = fl - failed;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* and if there is anything left at the beginning of the buffer */
|
||||
if ( count - fl )
|
||||
copy_to_user (buffer + fl, lx->lx_buffer, count - fl);
|
||||
if (count - fl) {
|
||||
failed = copy_to_user (buffer + fl, lx->lx_buffer, count - fl);
|
||||
if (failed) {
|
||||
count -= failed;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
/* update the index */
|
||||
lx->lx_read += count;
|
||||
lx->lx_read %= lx->buffer_size;
|
||||
|
||||
return (count);
|
||||
}
|
||||
|
||||
static inline int spacefree(int read, int write, int size)
|
||||
{
|
||||
if (read == write) {
|
||||
/* never fill the buffer completely, so indexes are always equal if empty
|
||||
and only empty, or !equal if data available */
|
||||
return (size - 1);
|
||||
}
|
||||
|
||||
return ((read + size - write) % size) - 1;
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t rtlx_write(struct file *file, const char __user * buffer,
|
||||
size_t count, loff_t * ppos)
|
||||
{
|
||||
unsigned long failed;
|
||||
int minor;
|
||||
struct rtlx_channel *rt;
|
||||
size_t fl;
|
||||
@ -277,7 +254,7 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer,
|
||||
if (!spacefree(rt->rt_read, rt->rt_write, rt->buffer_size)) {
|
||||
|
||||
if (file->f_flags & O_NONBLOCK)
|
||||
return (-EAGAIN);
|
||||
return -EAGAIN;
|
||||
|
||||
add_wait_queue(&channel_wqs[minor].rt_queue, &wait);
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
@ -290,52 +267,64 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer,
|
||||
}
|
||||
|
||||
/* total number of bytes to copy */
|
||||
count = min( count, (size_t)spacefree(rt->rt_read, rt->rt_write, rt->buffer_size) );
|
||||
count = min(count, (size_t)spacefree(rt->rt_read, rt->rt_write, rt->buffer_size) );
|
||||
|
||||
/* first bit from write pointer to the end of the buffer, or count */
|
||||
fl = min(count, (size_t) rt->buffer_size - rt->rt_write);
|
||||
|
||||
copy_from_user(&rt->rt_buffer[rt->rt_write], buffer, fl);
|
||||
failed = copy_from_user(&rt->rt_buffer[rt->rt_write], buffer, fl);
|
||||
if (failed) {
|
||||
count = fl - failed;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* if there's any left copy to the beginning of the buffer */
|
||||
if( count - fl )
|
||||
copy_from_user(rt->rt_buffer, buffer + fl, count - fl);
|
||||
if (count - fl) {
|
||||
failed = copy_from_user(rt->rt_buffer, buffer + fl, count - fl);
|
||||
if (failed) {
|
||||
count -= failed;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
rt->rt_write += count;
|
||||
rt->rt_write %= rt->buffer_size;
|
||||
|
||||
return(count);
|
||||
return count;
|
||||
}
|
||||
|
||||
static struct file_operations rtlx_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = rtlx_open,
|
||||
.release = rtlx_release,
|
||||
.write = rtlx_write,
|
||||
.read = rtlx_read,
|
||||
.poll = rtlx_poll
|
||||
.owner = THIS_MODULE,
|
||||
.open = rtlx_open,
|
||||
.release = rtlx_release,
|
||||
.write = rtlx_write,
|
||||
.read = rtlx_read,
|
||||
.poll = rtlx_poll
|
||||
};
|
||||
|
||||
static int rtlx_module_init(void)
|
||||
static char register_chrdev_failed[] __initdata =
|
||||
KERN_ERR "rtlx_module_init: unable to register device\n";
|
||||
|
||||
static int __init rtlx_module_init(void)
|
||||
{
|
||||
if ((major = register_chrdev(RTLX_MAJOR, module_name, &rtlx_fops)) < 0) {
|
||||
printk("rtlx_module_init: unable to register device\n");
|
||||
return (-EBUSY);
|
||||
major = register_chrdev(0, module_name, &rtlx_fops);
|
||||
if (major < 0) {
|
||||
printk(register_chrdev_failed);
|
||||
return major;
|
||||
}
|
||||
|
||||
if (major == 0)
|
||||
major = RTLX_MAJOR;
|
||||
|
||||
return (0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void rtlx_module_exit(void)
|
||||
static void __exit rtlx_module_exit(void)
|
||||
{
|
||||
unregister_chrdev(major, module_name);
|
||||
}
|
||||
|
||||
module_init(rtlx_module_init);
|
||||
module_exit(rtlx_module_exit);
|
||||
|
||||
MODULE_DESCRIPTION("MIPS RTLX");
|
||||
MODULE_AUTHOR("Elizabeth Clarke, MIPS Technologies, Inc");
|
||||
MODULE_AUTHOR("Elizabeth Clarke, MIPS Technologies, Inc.");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@ -384,9 +384,6 @@ give_sigsegv:
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern void setup_rt_frame_n32(struct k_sigaction * ka,
|
||||
struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);
|
||||
|
||||
static inline int handle_signal(unsigned long sig, siginfo_t *info,
|
||||
struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
|
||||
{
|
||||
|
||||
@ -647,8 +647,8 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
|
||||
return (void *)((sp - frame_size) & ALMASK);
|
||||
}
|
||||
|
||||
void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
|
||||
int signr, sigset_t *set)
|
||||
int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
|
||||
int signr, sigset_t *set)
|
||||
{
|
||||
struct sigframe *frame;
|
||||
int err = 0;
|
||||
@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
|
||||
current->comm, current->pid,
|
||||
frame, regs->cp0_epc, frame->sf_code);
|
||||
#endif
|
||||
return;
|
||||
return 1;
|
||||
|
||||
give_sigsegv:
|
||||
force_sigsegv(signr, current);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info)
|
||||
int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
|
||||
int signr, sigset_t *set, siginfo_t *info)
|
||||
{
|
||||
struct rt_sigframe32 *frame;
|
||||
int err = 0;
|
||||
@ -763,10 +765,11 @@ void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr,
|
||||
current->comm, current->pid,
|
||||
frame, regs->cp0_epc, frame->rs_code);
|
||||
#endif
|
||||
return;
|
||||
return 1;
|
||||
|
||||
give_sigsegv:
|
||||
force_sigsegv(signr, current);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int handle_signal(unsigned long sig, siginfo_t *info,
|
||||
|
||||
@ -58,10 +58,6 @@
|
||||
|
||||
typedef void *vpe_handle;
|
||||
|
||||
// defined here because the kernel module loader doesn't have
|
||||
// anything to do with it.
|
||||
#define SHN_MIPS_SCOMMON 0xff03
|
||||
|
||||
#ifndef ARCH_SHF_SMALL
|
||||
#define ARCH_SHF_SMALL 0
|
||||
#endif
|
||||
@ -69,11 +65,8 @@ typedef void *vpe_handle;
|
||||
/* If this is set, the section belongs in the init part of the module */
|
||||
#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
|
||||
|
||||
// temp number,
|
||||
#define VPE_MAJOR 63
|
||||
|
||||
static char module_name[] = "vpe";
|
||||
static int major = 0;
|
||||
static int major;
|
||||
|
||||
/* grab the likely amount of memory we will need. */
|
||||
#ifdef CONFIG_MIPS_VPE_LOADER_TOM
|
||||
@ -98,22 +91,7 @@ enum tc_state {
|
||||
TC_STATE_DYNAMIC
|
||||
};
|
||||
|
||||
struct vpe;
|
||||
typedef struct tc {
|
||||
enum tc_state state;
|
||||
int index;
|
||||
|
||||
/* parent VPE */
|
||||
struct vpe *pvpe;
|
||||
|
||||
/* The list of TC's with this VPE */
|
||||
struct list_head tc;
|
||||
|
||||
/* The global list of tc's */
|
||||
struct list_head list;
|
||||
} tc_t;
|
||||
|
||||
typedef struct vpe {
|
||||
struct vpe {
|
||||
enum vpe_state state;
|
||||
|
||||
/* (device) minor associated with this vpe */
|
||||
@ -135,7 +113,21 @@ typedef struct vpe {
|
||||
|
||||
/* shared symbol address */
|
||||
void *shared_ptr;
|
||||
} vpe_t;
|
||||
};
|
||||
|
||||
struct tc {
|
||||
enum tc_state state;
|
||||
int index;
|
||||
|
||||
/* parent VPE */
|
||||
struct vpe *pvpe;
|
||||
|
||||
/* The list of TC's with this VPE */
|
||||
struct list_head tc;
|
||||
|
||||
/* The global list of tc's */
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
struct vpecontrol_ {
|
||||
/* Virtual processing elements */
|
||||
@ -146,7 +138,7 @@ struct vpecontrol_ {
|
||||
} vpecontrol;
|
||||
|
||||
static void release_progmem(void *ptr);
|
||||
static void dump_vpe(vpe_t * v);
|
||||
static void dump_vpe(struct vpe * v);
|
||||
extern void save_gp_address(unsigned int secbase, unsigned int rel);
|
||||
|
||||
/* get the vpe associated with this minor */
|
||||
@ -197,13 +189,11 @@ struct vpe *alloc_vpe(int minor)
|
||||
{
|
||||
struct vpe *v;
|
||||
|
||||
if ((v = kmalloc(sizeof(struct vpe), GFP_KERNEL)) == NULL) {
|
||||
if ((v = kzalloc(sizeof(struct vpe), GFP_KERNEL)) == NULL) {
|
||||
printk(KERN_WARNING "VPE: alloc_vpe no mem\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memset(v, 0, sizeof(struct vpe));
|
||||
|
||||
INIT_LIST_HEAD(&v->tc);
|
||||
list_add_tail(&v->list, &vpecontrol.vpe_list);
|
||||
|
||||
@ -216,13 +206,11 @@ struct tc *alloc_tc(int index)
|
||||
{
|
||||
struct tc *t;
|
||||
|
||||
if ((t = kmalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) {
|
||||
if ((t = kzalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) {
|
||||
printk(KERN_WARNING "VPE: alloc_tc no mem\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memset(t, 0, sizeof(struct tc));
|
||||
|
||||
INIT_LIST_HEAD(&t->tc);
|
||||
list_add_tail(&t->list, &vpecontrol.tc_list);
|
||||
|
||||
@ -412,16 +400,17 @@ static int apply_r_mips_26(struct module *me, uint32_t *location,
|
||||
return -ENOEXEC;
|
||||
}
|
||||
|
||||
/* Not desperately convinced this is a good check of an overflow condition
|
||||
anyway. But it gets in the way of handling undefined weak symbols which
|
||||
we want to set to zero.
|
||||
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
||||
printk(KERN_ERR
|
||||
"module %s: relocation overflow\n",
|
||||
me->name);
|
||||
return -ENOEXEC;
|
||||
}
|
||||
*/
|
||||
/*
|
||||
* Not desperately convinced this is a good check of an overflow condition
|
||||
* anyway. But it gets in the way of handling undefined weak symbols which
|
||||
* we want to set to zero.
|
||||
* if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
||||
* printk(KERN_ERR
|
||||
* "module %s: relocation overflow\n",
|
||||
* me->name);
|
||||
* return -ENOEXEC;
|
||||
* }
|
||||
*/
|
||||
|
||||
*location = (*location & ~0x03ffffff) |
|
||||
((*location + (v >> 2)) & 0x03ffffff);
|
||||
@ -681,7 +670,7 @@ static void dump_tclist(void)
|
||||
}
|
||||
|
||||
/* We are prepared so configure and start the VPE... */
|
||||
int vpe_run(vpe_t * v)
|
||||
int vpe_run(struct vpe * v)
|
||||
{
|
||||
unsigned long val;
|
||||
struct tc *t;
|
||||
@ -772,7 +761,7 @@ int vpe_run(vpe_t * v)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs,
|
||||
static unsigned long find_vpe_symbols(struct vpe * v, Elf_Shdr * sechdrs,
|
||||
unsigned int symindex, const char *strtab,
|
||||
struct module *mod)
|
||||
{
|
||||
@ -792,10 +781,12 @@ static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Allocates a VPE with some program code space(the load address), copies the contents
|
||||
of the program (p)buffer performing relocatations/etc, free's it when finished.
|
||||
/*
|
||||
* Allocates a VPE with some program code space(the load address), copies
|
||||
* the contents of the program (p)buffer performing relocatations/etc,
|
||||
* free's it when finished.
|
||||
*/
|
||||
int vpe_elfload(vpe_t * v)
|
||||
int vpe_elfload(struct vpe * v)
|
||||
{
|
||||
Elf_Ehdr *hdr;
|
||||
Elf_Shdr *sechdrs;
|
||||
@ -931,7 +922,7 @@ cleanup:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void dump_vpe(vpe_t * v)
|
||||
static void dump_vpe(struct vpe * v)
|
||||
{
|
||||
struct tc *t;
|
||||
|
||||
@ -947,7 +938,7 @@ static void dump_vpe(vpe_t * v)
|
||||
static int vpe_open(struct inode *inode, struct file *filp)
|
||||
{
|
||||
int minor;
|
||||
vpe_t *v;
|
||||
struct vpe *v;
|
||||
|
||||
/* assume only 1 device at the mo. */
|
||||
if ((minor = MINOR(inode->i_rdev)) != 1) {
|
||||
@ -1001,7 +992,7 @@ static int vpe_open(struct inode *inode, struct file *filp)
|
||||
static int vpe_release(struct inode *inode, struct file *filp)
|
||||
{
|
||||
int minor, ret = 0;
|
||||
vpe_t *v;
|
||||
struct vpe *v;
|
||||
Elf_Ehdr *hdr;
|
||||
|
||||
minor = MINOR(inode->i_rdev);
|
||||
@ -1035,7 +1026,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
|
||||
{
|
||||
int minor;
|
||||
size_t ret = count;
|
||||
vpe_t *v;
|
||||
struct vpe *v;
|
||||
|
||||
minor = MINOR(file->f_dentry->d_inode->i_rdev);
|
||||
if ((v = get_vpe(minor)) == NULL)
|
||||
@ -1180,14 +1171,11 @@ static int __init vpe_module_init(void)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if ((major = register_chrdev(VPE_MAJOR, module_name, &vpe_fops) < 0)) {
|
||||
if ((major = register_chrdev(0, module_name, &vpe_fops) < 0)) {
|
||||
printk("VPE loader: unable to register character device\n");
|
||||
return -EBUSY;
|
||||
return major;
|
||||
}
|
||||
|
||||
if (major == 0)
|
||||
major = VPE_MAJOR;
|
||||
|
||||
dmt();
|
||||
dvpe();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user