~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/firewire/core-cdev.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
216
216
        struct fw_cdev_event_phy_packet phy_packet;
217
217
};
218
218
 
219
 
static inline void __user *u64_to_uptr(__u64 value)
 
219
#ifdef CONFIG_COMPAT
 
220
static void __user *u64_to_uptr(u64 value)
 
221
{
 
222
        if (is_compat_task())
 
223
                return compat_ptr(value);
 
224
        else
 
225
                return (void __user *)(unsigned long)value;
 
226
}
 
227
 
 
228
static u64 uptr_to_u64(void __user *ptr)
 
229
{
 
230
        if (is_compat_task())
 
231
                return ptr_to_compat(ptr);
 
232
        else
 
233
                return (u64)(unsigned long)ptr;
 
234
}
 
235
#else
 
236
static inline void __user *u64_to_uptr(u64 value)
220
237
{
221
238
        return (void __user *)(unsigned long)value;
222
239
}
223
240
 
224
 
static inline __u64 uptr_to_u64(void __user *ptr)
 
241
static inline u64 uptr_to_u64(void __user *ptr)
225
242
{
226
 
        return (__u64)(unsigned long)ptr;
 
243
        return (u64)(unsigned long)ptr;
227
244
}
 
245
#endif /* CONFIG_COMPAT */
228
246
 
229
247
static int fw_device_op_open(struct inode *inode, struct file *file)
230
248
{