diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 14:49:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 14:49:01 +1000 |
| commit | 241c573c2059538e220fb61b7abdd7b869b9ce1c (patch) | |
| tree | d4b5978cd32aace642f285973e22c2639c6e461c /arch/sparc | |
| parent | 8f73439b6dd516613a31fe040ad655ce953c96ce (diff) | |
| parent | 9599bc4b997ccd416665c66ab6ea090163c7432c (diff) | |
Merge remote branch 'bkl-llseek/llseek'
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/apc.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/mdesc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c index 2c0046ecc715..52de4a9424e8 100644 --- a/arch/sparc/kernel/apc.c +++ b/arch/sparc/kernel/apc.c @@ -132,6 +132,7 @@ static const struct file_operations apc_fops = { .unlocked_ioctl = apc_ioctl, .open = apc_open, .release = apc_release, + .llseek = noop_llseek, }; static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops }; diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c index 83e85c2e802a..6addb914fcc8 100644 --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c @@ -890,6 +890,7 @@ static ssize_t mdesc_read(struct file *file, char __user *buf, static const struct file_operations mdesc_fops = { .read = mdesc_read, .owner = THIS_MODULE, + .llseek = noop_llseek, }; static struct miscdevice mdesc_misc = { |